X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=76699a2c9dc6a34ebf874c7e7cc0ac450ac4dd13;hb=c3082e5ca0f9edbc50632e740cdb63e8af2972bb;hp=49e8f56560dee7b526f964be512c41ef40340a1b;hpb=68921ee17c7867c852cc5b70eafc747bd16d6246;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 49e8f5656..76699a2c9 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 29 07:23:11 CEST 2022
+Tue Oct 25 07:23:24 CEST 2022