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

diff --git a/.tx/merge-base b/.tx/merge-base
index f78e6e247..aaade5f75 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec 21 07:51:44 CET 2014
+Tue Jan 13 19:44:31 CET 2015