X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=0f5fe0e2f91b385a6cf7a0020d68a99f4046f3fd;hb=058ccd46345829ed155c50fa94bf4957bd2bca93;hp=0cd13217a121c2bed5460ba34bda8d11bfb2fecc;hpb=865b6850172f0afde171d638656bef17fc49e336;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0cd13217a..0f5fe0e2f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun 30 07:25:26 CEST 2019
+Fri Oct 18 07:24:34 CEST 2019