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

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