X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=431dcbe974dc57728a788a275a92bcbc985444ca;hb=f41f81f37e3ecf5a2d14f7bc7ffd7bbf09fff32e;hp=0f4d533661e1fc2767273c5c4b2bbdbc4e67503e;hpb=bfa78a08e2ab4b7fb1fba7a341f82a7824d19228;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0f4d53366..431dcbe97 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Feb 27 07:23:43 CET 2018
+Sat Mar 17 07:23:46 CET 2018