X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=c9ceb249efc55a0a832742c2eaea5d291881c69a;hb=9e1e7a5a934788e2ed90fc6603ffabb3a9007915;hp=493799a88292e888384b25164e0a25dc0751a198;hpb=44fe6a17319cf4a69fd803bf60011b9fad081dbd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 493799a88..c9ceb249e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct 30 07:23:57 CET 2022
+Thu 25 May 2023 07:22:59 AM CEST