X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=5a5c28047009e11e9d1d1e1ccd3d041531dc59e4;hp=c0ddb1d5fcf165824eec0aa7cb56ef6d8153110a;hb=23dd6f2c565d74ee081b453d5666a73c7ed3f0a4;hpb=6e4c0c69ce16c05cdc8ce97c5287c848acfc3b1f

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