X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=b2b2ddca631fe972b7a6fe63d6ecdf789d678128;hb=ae6e4df06f1d84cc99200844a13ab6ecbffaee1c;hp=b0c891bbe5a7864b64d51f6a4f719d66c54d03ac;hpb=8da45596c76bb645e864b4ec8ff5a3ee13bbf27c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index b0c891bbe..b2b2ddca6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Aug 31 21:02:59 CEST 2015
+Fri Jan 15 22:48:00 CET 2016