X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=aed016f743542b9333181caa241701e6cce23691;hb=ea797735e567e282ba32073d105374d683578f7c;hp=0e3c61613bb55ac30cc474cab3c3c640ce25adab;hpb=1a18ff8e9f729e903015f5baa6605c92c92ea13d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0e3c61613..aed016f74 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 12 07:24:40 CEST 2019
+Fri Aug 30 07:24:34 CEST 2019