X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=15b91cc93beaedd2dc0962e3c2d06f6a8b1b5c14;hb=e824d4612617171b932bba08f1a5a50500d4a603;hp=249da913339d42b751c0a2e1cbce7859e813b386;hpb=21f9bca22468d946a5cb720f05b4f5c56cc767c8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 249da9133..15b91cc93 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Dec 19 07:25:06 CET 2019
+Wed Apr  8 07:24:18 CEST 2020