X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=65f8f7b31f6c7f9928d729c4110304efe3406858;hp=cd980f22799fc7af04b52c9315183818bfbee453;hpb=d452d6abd61f68e6bff8a142ef4411579264fd83;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index cd980f227..67a023d4c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jul  3 07:24:35 CEST 2019
+Thu Sep 12 07:24:50 CEST 2019