X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=4e3d23531803bb92806de9ee0a6b0e67a5974aa0;hb=83d5456d62665fd2e44b474be8fffac29ff9deca;hp=324a74c035a73eaed64e84fc0acd8447d585f6d6;hpb=99c3e6da047827e29ecd320cc39215ae3a951637;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 324a74c03..4e3d23531 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 27 07:23:39 CET 2022
+Sun 28 May 2023 07:22:59 AM CEST