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

diff --git a/.tx/merge-base b/.tx/merge-base
index 6f259e171..ff101608a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Nov  2 07:23:23 CET 2022
+Sun 05 Feb 2023 07:22:56 AM CET