X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=d8e73f411f306e6d475bf385bfe5777692aee4a0;hp=aed016f743542b9333181caa241701e6cce23691;hpb=9fb7d3c8ac5ebfa87850cfa28dcc41940fa9cbfb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index aed016f74..67a023d4c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Aug 30 07:24:34 CEST 2019
+Thu Sep 12 07:24:50 CEST 2019