X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=b79568c515eb2836ba9f12acd1c84af6efaa4375;hb=426dd3338ec53b571c9dc760321669ce9ab7372e;hp=cdaf7ef0d85e2a53a9f399dba1c8550f2bccc071;hpb=cc84ebedeb4523efb23fa8c5dd1e703cd0434a23;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index cdaf7ef0d..b79568c51 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Dec  2 07:23:24 CET 2022
+Fri Dec 16 07:23:28 CET 2022