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

diff --git a/.tx/merge-base b/.tx/merge-base
index 96df62bc30..67a023d4c8 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Apr 14 07:25:31 CEST 2019
+Thu Sep 12 07:24:50 CEST 2019