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

diff --git a/.tx/merge-base b/.tx/merge-base
index abf02d0c6..c9ceb249e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun 30 Apr 2023 07:23:00 AM CEST
+Thu 25 May 2023 07:22:59 AM CEST