X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=1a0547ae16f0196b17f6734ab578be059f63a0fd;hb=62f62d4c67b0c016bb27cb7ceaef9e6282d62313;hp=d924d4334c37498374be7341e9e1b42d38a30a41;hpb=58a95ec5f78cdff859ba461c7fbddd856679db13;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index d924d4334..1a0547ae1 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jan 27 07:23:29 CET 2023
+Sun 25 Jun 2023 07:22:59 AM CEST