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

diff --git a/.tx/merge-base b/.tx/merge-base
index 41092cd20..b2b2ddca6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 28 22:25:00 CET 2015
+Fri Jan 15 22:48:00 CET 2016