X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=d15698b68730a588bc9947b1ab0d36958f1fe1c1;hp=c0ddb1d5fcf165824eec0aa7cb56ef6d8153110a;hb=2710455ddaf70ca7cadf5d6c351583195a52740f;hpb=1b0decb9afb829407eae763b3053a122e2ae3de6

diff --git a/.tx/merge-base b/.tx/merge-base
index c0ddb1d5fc..d15698b687 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Feb 14 07:23:42 CET 2018
+Mon Jul 23 07:24:17 CEST 2018