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

diff --git a/.tx/merge-base b/.tx/merge-base
index f7e1fc243..6d3cbe531 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jun  2 07:24:20 CEST 2018
+Sun Nov  4 07:24:04 CET 2018