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

diff --git a/.tx/merge-base b/.tx/merge-base
index 95e7fe594..9745f6136 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun  4 07:23:50 CEST 2017
+Sun Jun  3 07:24:16 CEST 2018