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

diff --git a/.tx/merge-base b/.tx/merge-base
index 4d49f61166..3dfd538ed8 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Oct 30 07:24:07 CET 2018
+Tue Dec 18 07:24:08 CET 2018