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

diff --git a/.tx/merge-base b/.tx/merge-base
index 2a05ab1df..27d0db5ac 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Dec 19 07:24:12 CET 2018
+Tue Jul 30 07:24:47 CEST 2019