X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=15b91cc93beaedd2dc0962e3c2d06f6a8b1b5c14;hb=2109167b6ebf070d1797ac92a3f5f3a42578127e;hp=4b64ea073cc7e8ffe7ef2f5f159190eacb7af617;hpb=a2ffc9f0592984179393089c7b740d851df5dac5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 4b64ea073..15b91cc93 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 07:24:32 CEST 2019
+Wed Apr  8 07:24:18 CEST 2020