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

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