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

diff --git a/.tx/merge-base b/.tx/merge-base
index df5f27c1b..99d127cbd 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Dec 28 07:24:50 CET 2019
+Sat Jun  6 07:23:41 CEST 2020