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

diff --git a/.tx/merge-base b/.tx/merge-base
index b2b2ddca6..efe8262cb 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jan 15 22:48:00 CET 2016
+Sat Jul  8 07:24:47 CEST 2017