X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=9c7ea1a271d7f5046209fae494dcef61deb06743;hb=ebf4349b361dbd0a93475c87479c8f273ca07e86;hp=92b5b48ecaeb26409e793f1cdae7dc07ce675f44;hpb=a4d5da17b40e13206fa0ff807a02f936fa4a38e5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 92b5b48ec..9c7ea1a27 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 18 07:23:17 CEST 2022
+Sun Jul 31 07:23:46 CEST 2022