X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=3dfd538ed89000fbdcf186eb03fbbbab05ce77d8;hp=3512ca5dc542939aff93cadaafcc1544cf16655e;hb=1b5336cea7e652df4a85bfbca268e5ceba7e746e;hpb=16e64ff58cf65d7b3e0815aadb530580a6aa251b

diff --git a/.tx/merge-base b/.tx/merge-base
index 3512ca5dc5..3dfd538ed8 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep 30 07:24:04 CEST 2018
+Tue Dec 18 07:24:08 CET 2018