X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=311c3c3534c94b474d44b826d0584685b4d337ff;hb=HEAD;hp=dc5d4249a6bef36a412af495c277725f972b0ce0;hpb=254a632ddc34afc8281ed4d7a77cc667d836c239;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index dc5d4249a..71a1bf6a4 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Mar 15 02:53:37 PM CET 2024
+Thu Jun 13 07:23:01 AM CEST 2024