X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=639baba190be690e68793b7566d406c9399b1dcb;hb=ca351e810d7495c62a1a60f2607cbe969653fe59;hp=5b3397d71c7db3972b45aa3193e59c7c8758d127;hpb=068fc1c916164bbff2654d638a372cf6d642e650;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 5b3397d71..639baba19 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep 11 07:23:56 CEST 2022
+Thu Oct  6 07:23:29 CEST 2022