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

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