X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=aaade5f752afc2314c43225e618bd799b63a3022;hb=f12e0d90c7d266d2b899ecb9c7a3eb6ffaeb3282;hp=f78e6e247e48867d44d1451efcb036ba4cadfe59;hpb=3e0fddda385e26f84951f699bd0292aef3e21188;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