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

diff --git a/.tx/merge-base b/.tx/merge-base
index 35a62f156..0f5fe0e2f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Apr 20 07:24:16 CEST 2019
+Fri Oct 18 07:24:34 CEST 2019