X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=b0c891bbe5a7864b64d51f6a4f719d66c54d03ac;hp=a517ba03f14a4147d472872428ddb4e51b1b68fe;hb=b822740ca8df332014ffcb6c62d3aee87f636925;hpb=3bd825ec4ff3c071ccefb2b4424339b3b4b49315

diff --git a/.tx/merge-base b/.tx/merge-base
index a517ba03f1..b0c891bbe5 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  4 16:12:08 CEST 2014
+Mon Aug 31 21:02:59 CEST 2015