X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=eb5d63f9457da500dfad22d7627d1c866d438f9d;hb=4d55fe69cc782f9b5e2bd9661885d7a0b243d40c;hp=12065479d19c4345b2605eef49aebfb6b22973b4;hpb=42c9490f63f3826305385e355e89dfdad1be5bb5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 12065479d..eb5d63f94 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu May 28 07:23:59 CEST 2020
+Mon Oct 19 07:23:41 CEST 2020