X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=4f849218d30ab3a04f2231023964949cc64f6504;hb=b4b14eaabbc143b9705a020749495525364b8663;hp=08c57f3f031cdde73c881a68bda2c0ed55192a21;hpb=7c75385396c0eb156805890e252001e6e5c2c81d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 08c57f3f0..4f849218d 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri 09 Jun 2023 07:22:57 AM CEST
+Sat Jan 20 07:23:48 AM CET 2024