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

diff --git a/.tx/merge-base b/.tx/merge-base
index e21e87920..67a023d4c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan 12 07:24:11 CET 2019
+Thu Sep 12 07:24:50 CEST 2019