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

diff --git a/.tx/merge-base b/.tx/merge-base
index ce6cbf01f..639baba19 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Sep 12 07:23:24 CEST 2022
+Thu Oct  6 07:23:29 CEST 2022