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

diff --git a/.tx/merge-base b/.tx/merge-base
index 3deea699e..0f7157ee2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Mar  7 19:43:03 CET 2017
+Sun Apr  2 07:23:39 CEST 2017