X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=0f7157ee2d0918695cbd67f6727aa81ef37dc17b;hb=af7ecbff777859dbf824f2de864d736936b0a12c;hp=9893524f6ee2a6c7f9b3f26d2ab7069a3d49da7c;hpb=6970c2ab91e2ac5057eddf2d50a73fe81f39fbc4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 9893524f6..0f7157ee2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Mar 30 07:24:50 CEST 2017
+Sun Apr  2 07:23:39 CEST 2017