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

diff --git a/.tx/merge-base b/.tx/merge-base
index c4e582b2c..6d3cbe531 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May  2 07:24:03 CEST 2018
+Sun Nov  4 07:24:04 CET 2018