X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=b2ce294c1ba76b0b6943ae16b67a7772bd17cffd;hb=e357f4f2cc566737d482e2b510fd0078c0f3c926;hp=f48c3caec4c47b2c4a57a79babe010e172600f8b;hpb=9b730a745cecb6f0b7e0c50005b49ed49fcd1995;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index f48c3caec..b2ce294c1 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jan  8 07:23:08 AM CET 2024
+Mon Apr  1 07:22:55 AM CEST 2024