X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=ff101608acc152d056aaffa87ca72dd3c2a60920;hb=8397f309599d4074e40e3939d2621e98ff6fd6bb;hp=6989a3b9b7fcb727e992964797c94ab2b3575ebd;hpb=79665cc48c3183cade94c43cfc8d41c3434b7029;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 6989a3b9b..ff101608a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 15 07:23:15 CEST 2022
+Sun 05 Feb 2023 07:22:56 AM CET