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

diff --git a/.tx/merge-base b/.tx/merge-base
index d03c707af..0f7157ee2 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May 10 21:52:13 CEST 2016
+Sun Apr  2 07:23:39 CEST 2017