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

diff --git a/.tx/merge-base b/.tx/merge-base
index 47f50b962..b79568c51 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Oct 18 07:23:25 CEST 2022
+Fri Dec 16 07:23:28 CET 2022