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

diff --git a/.tx/merge-base b/.tx/merge-base
index e525fd0a8..c69cff513 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Mar 17 07:23:07 CET 2022
+Wed Aug 31 07:23:24 CEST 2022