X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=cad03ae669ccf13942c8bfdb86db840a17871dd4;hb=49b5ad920413d125a3c060494cc48e9c4aa63e34;hp=97d57c7b2c5c986fd0e535697c5d38e2d0c0e5ef;hpb=757d49d40466d3e431bf0c996e68372594f37888;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 97d57c7b2..c69cff513 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jan  7 07:23:03 CET 2022
+Wed Aug 31 07:23:24 CEST 2022