X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=6d3cbe531f5acfa82e643da05e53f5952c5a1ecb;hb=c63e02fb9afe1542b3c1b64f81c6c77ba4db3368;hp=12e22e55744578d3ad8135aac71ec33813f92f0e;hpb=b667b525699a84c873d4486558878ea112a6440e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 12e22e557..6d3cbe531 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep  2 07:24:05 CEST 2018
+Sun Nov  4 07:24:04 CET 2018