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

diff --git a/.tx/merge-base b/.tx/merge-base
index bc9c40b86..0f5fe0e2f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jun 13 07:24:36 CEST 2019
+Fri Oct 18 07:24:34 CEST 2019