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

diff --git a/.tx/merge-base b/.tx/merge-base
index 8a84c44bc..9745f6136 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May 29 07:24:23 CEST 2018
+Sun Jun  3 07:24:16 CEST 2018