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

diff --git a/.tx/merge-base b/.tx/merge-base
index d43cc1d8c..c9ceb249e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Dec 17 07:23:26 CET 2022
+Thu 25 May 2023 07:22:59 AM CEST