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

diff --git a/.tx/merge-base b/.tx/merge-base
index 76b17ee0d..99d127cbd 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 13 07:23:38 CEST 2020
+Sat Jun  6 07:23:41 CEST 2020