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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1431444199..0f5fe0e2f9 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jun 24 07:24:34 CEST 2019
+Fri Oct 18 07:24:34 CEST 2019