X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=2a05ab1dfc4d71f704da4e4ddf78b9ccdc64d120;hb=e80a7f5a11fc1cf63ad7130303a89dc78cb807a8;hp=d15698b68730a588bc9947b1ab0d36958f1fe1c1;hpb=338f8f4862627b3ee04cbdd20dc5590973614e01;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index d15698b68..2a05ab1df 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jul 23 07:24:17 CEST 2018
+Wed Dec 19 07:24:12 CET 2018