X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=ba83f7ff83e3ef8a77b7601b135a4f3940a7dd77;hb=5453f53da1df88742c11c71e4dc5b9c3e3d24c62;hp=e356a5d8651eaf48405d7cd183bccef81f717ba1;hpb=1d393ab5e7ac4ff78cb4240aea74992d19658d66;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index e356a5d86..ba83f7ff8 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 23 07:24:29 CEST 2018
+Tue Jul 10 07:24:23 CEST 2018