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

diff --git a/.tx/merge-base b/.tx/merge-base
index db68ce747..0f7157ee2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Oct 13 21:18:19 CEST 2015
+Sun Apr  2 07:23:39 CEST 2017