X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=6989a3b9b7fcb727e992964797c94ab2b3575ebd;hb=79665cc48c3183cade94c43cfc8d41c3434b7029;hp=41063ec71c4bb5c14c311f3b208ad893afd82c0d;hpb=6062327f5a69ea3c2fe236f0d1304140f6b3a43f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 41063ec71..6989a3b9b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat May 28 07:23:08 CEST 2022
+Fri Jul 15 07:23:15 CEST 2022