X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=ba83f7ff83e3ef8a77b7601b135a4f3940a7dd77;hp=8a84c44bcb0f502f0ab79fe922c595cbbbd727a3;hb=ec04dfbf07e047ea23638f213bbdb1c47316b364;hpb=9823f3be38c0225965c480a9584ab9bba1eee3ae

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