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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0e9dfe1b9..b79568c51 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 12 07:23:26 CET 2022
+Fri Dec 16 07:23:28 CET 2022