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

diff --git a/.tx/merge-base b/.tx/merge-base
index 5b3397d71..b79568c51 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep 11 07:23:56 CEST 2022
+Fri Dec 16 07:23:28 CET 2022