X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=inline;f=.tx%2Fmerge-base;h=e8a40d84e7f3fb46098331ff1113fe6e86e9d73e;hb=0f35bc8117859f49ee7d77def029f1a1eeebc29a;hp=6df328b856fe5f3c70154d317071f2418658565c;hpb=085ae08e3eededdb20b07ad0f18e29d8c632487b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 6df328b85..e8a40d84e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun 11 Jun 2023 07:22:57 AM CEST
+Sat 05 Aug 2023 07:23:02 AM CEST