X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=62088368acce8c56cfed1aa14b4061a07e777505;hb=bd30fb6eec40c60f86f04cb26705c0872e1a89a4;hp=324a74c035a73eaed64e84fc0acd8447d585f6d6;hpb=7df1c279beb4c7f540745a09a8135b202bd11cfa;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 324a74c03..62088368a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 27 07:23:39 CET 2022
+Sun 16 Apr 2023 07:24:58 AM CEST