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

diff --git a/.tx/merge-base b/.tx/merge-base
index b358534c32..5a5c280470 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jul  8 07:24:19 CEST 2018
+Mon Jul  9 07:24:10 CEST 2018