X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=143144419996b561cfe4a73ee3eb14565bf56a07;hb=f24c1ab39321a756bb76d1699a775fe1e42040ab;hp=d5c8aa735bea155daf3ab6e5f899b8eb29394beb;hpb=0ed5affd904e46cf4d5f43c12e480df5cace2f37;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index d5c8aa735..143144419 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jan 10 07:24:09 CET 2019
+Mon Jun 24 07:24:34 CEST 2019