X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=0f7157ee2d0918695cbd67f6727aa81ef37dc17b;hp=cd53b6c9fab9227ddd1dfe27201e2535bf4f177a;hb=af7ecbff777859dbf824f2de864d736936b0a12c;hpb=221325d0a55851348e3397354225f04cd472d42f

diff --git a/.tx/merge-base b/.tx/merge-base
index cd53b6c9f..0f7157ee2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Aug 20 01:26:52 CEST 2015
+Sun Apr  2 07:23:39 CEST 2017