X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=7e1d17ed00549331b338fcc91706af126a1a51aa;hb=19aa6d657a4043b94d6b69925cd147afd5922e5a;hp=547040790313863da4a7cfb44aa97d094f626ca5;hpb=9e32596bdae955be22e8a2021e5f4f67c235771e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 547040790..7e1d17ed0 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Nov 28 07:24:39 CET 2019
+Tue Jun 30 07:23:40 CEST 2020