X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=aaade5f752afc2314c43225e618bd799b63a3022;hb=a8e3826e2ddd4fe24121bfa5954128b14b428058;hp=fc9cb6ac1c5a04acf2701d0f8c28007055f3ec55;hpb=ff64f05501fbcb470513b2aee64b4aa271d3c6d4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index fc9cb6ac1..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan 18 14:52:20 CET 2014
+Tue Jan 13 19:44:31 CET 2015