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

diff --git a/.tx/merge-base b/.tx/merge-base
index 92ec4d2d0..71a1bf6a4 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 19 07:23:07 AM CET 2023
+Thu Jun 13 07:23:01 AM CEST 2024