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

diff --git a/.tx/merge-base b/.tx/merge-base
index c0ddb1d5f..2494b6256 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Feb 14 07:23:42 CET 2018
+Thu Jul 19 07:24:10 CEST 2018