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

diff --git a/.tx/merge-base b/.tx/merge-base
index 7a7217d25..7e1d17ed0 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jan 15 07:24:54 CET 2020
+Tue Jun 30 07:23:40 CEST 2020