X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=64801e8544f67a40360a6775dc18130a6a626921;hb=001c18815b288fdb18c6ce8a25440ea2ad266f31;hp=27c806745910173a6fdcd7329615c97aa07568f4;hpb=314e90960336ef340dc7eb34ae375a091ac60645;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 27c8067459..64801e8544 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Nov 16 07:24:08 CET 2018
+Tue Nov 27 07:24:07 CET 2018