X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=4b615d6ea3ee6794ea9368c782393c66ef55c170;hp=27d0db5ace70b7062d64d3138ea86384f87ba81f;hpb=e0012447bfce1b551df3dc01b043655aa93dafad;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 27d0db5ac..67a023d4c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jul 30 07:24:47 CEST 2019
+Thu Sep 12 07:24:50 CEST 2019