X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=7594dff44d2b1022727718c798327ccf1a89d621;hb=3ac7b0c8db5f0a2be2ceca0ad883271d0a3f6ede;hp=4d49f61166df3534d870d46bb9f3c717440b8556;hpb=cade5ea71341b3185fec1fd7499887fda7772021;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 4d49f6116..7594dff44 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Oct 30 07:24:07 CET 2018
+Sat Mar  9 07:24:12 CET 2019