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

diff --git a/.tx/merge-base b/.tx/merge-base
index c8dff0e9f..431dcbe97 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Feb 10 07:23:38 CET 2018
+Sat Mar 17 07:23:46 CET 2018