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

diff --git a/.tx/merge-base b/.tx/merge-base
index 8a9589ab3..c9ceb249e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jan  7 14:35:54 CET 2023
+Thu 25 May 2023 07:22:59 AM CEST