X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=inline;f=.tx%2Fmerge-base;h=efe8262cb690e24a55eb2e0ea36348e8f7685b5d;hb=05d8d41096560cbc497a3b6228f13687ab4f7504;hp=1164ee85ff98fe51431eb85526f70f37d06a6b53;hpb=ecb0b6500f0b8c6024b654f23209940a9f1684b2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 1164ee85f..efe8262cb 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr  5 07:23:38 CEST 2017
+Sat Jul  8 07:24:47 CEST 2017