X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=99d127cbd61dbcc4cf809204e97c02d821d74f9e;hb=dfeb73bcd0f3a285d34f0bf85ae16762ff97e890;hp=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hpb=272af6c038013ddb8ea8dd51b2e347bf22991bf0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 67a023d4c..99d127cbd 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Sep 12 07:24:50 CEST 2019
+Sat Jun  6 07:23:41 CEST 2020