X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=72a93f227ae58c764c7b5c6d69941b098ecc706c;hb=77938f12f36161281206b18b6361ab209c1d1a2e;hp=204f42b38cdff87571b5bd1df88bd28634cb0442;hpb=bf9e79eb1f1af523678927f9e221b6e9cf20bf9f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 204f42b38..72a93f227 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu May 31 07:24:27 CEST 2018
+Sat Nov  3 07:24:08 CET 2018