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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1fa00aae1..99d127cbd 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Oct 17 07:24:27 CEST 2019
+Sat Jun  6 07:23:41 CEST 2020