X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=6d3cbe531f5acfa82e643da05e53f5952c5a1ecb;hb=b4c43a766cec19289f3d987ce9c6f50762ab7b57;hp=2494b62567fb09ae30e1440bacf16f5bc9fea889;hpb=8c2011b5dd8e6e255af9266973cd5d3f49b33825;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 2494b6256..6d3cbe531 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jul 19 07:24:10 CEST 2018
+Sun Nov  4 07:24:04 CET 2018