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

diff --git a/.tx/merge-base b/.tx/merge-base
index aaade5f75..b2b2ddca6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 13 19:44:31 CET 2015
+Fri Jan 15 22:48:00 CET 2016