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

diff --git a/.tx/merge-base b/.tx/merge-base
index 275b04252..431dcbe97 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May  2 07:23:47 CEST 2017
+Sat Mar 17 07:23:46 CET 2018