X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=5df3cc1a3a63589557d7c5fe6acacd72b076301f;hb=76dd66af43f0f01131d019c3a8dacfe35a6f6a18;hp=e8b76ebee4ea4e22d60947f6b55edcc44cd5b78c;hpb=decae9170e9c82c24a2f9a4fa524c866c8e3d36e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index e8b76ebee..64801e854 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon May 15 07:23:51 CEST 2017
+Tue Nov 27 07:24:07 CET 2018