X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;fp=.tx%2Fmerge-base;h=224f3a5230ed7736e4315995330e129fd71f87fc;hb=dfbe194424c48f310c0bc891c058bce6b03e9212;hp=65393e99597204e4d9572a759adf814efb60b32b;hpb=efd282cf0e935bc54c17ad530a879c86c75a3a5e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 65393e995..224f3a523 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Nov 15 07:23:25 CET 2022
+Sun 26 Mar 2023 07:22:58 AM CEST