X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=3ea4651091cad2546f31cc9cf7463b056eb75855;hb=HEAD;hp=e1c06efd94becc977c55054379914354ef768992;hpb=1a422236da8455a8d68c152246d4b2292be9b986;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index e1c06efd9..bfc9c2986 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue 08 Aug 2023 07:23:00 AM CEST
+Mon Jun  3 07:23:03 AM CEST 2024