X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=8f3fd420949a286c6dd95a9806bb853b14a1493e;hb=d17fba96da03896d8f439bb89aa7f17895150488;hp=5ad8e8d693d40e8dddfb26516c8e78e31f9c1ce1;hpb=71fc0f0f03ecea79e11a71e3f8b51b77598a019e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 5ad8e8d69..8f3fd4209 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr  4 07:23:09 CEST 2022
+Tue Apr 12 07:23:16 CEST 2022