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

diff --git a/.tx/merge-base b/.tx/merge-base
index df5f27c1b..15b91cc93 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Dec 28 07:24:50 CET 2019
+Wed Apr  8 07:24:18 CEST 2020