X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=2f6b4caf1535a76a6a20a243bbb43997ca636fb7;hb=7726a7476b49f4cad3e9221064f63763f7bc804d;hp=c9ceb249efc55a0a832742c2eaea5d291881c69a;hpb=9f4a93b3133cf8f500531074694cac94b050923c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index c9ceb249e..2f6b4caf1 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu 25 May 2023 07:22:59 AM CEST
+Mon 29 May 2023 07:23:00 AM CEST