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

diff --git a/.tx/merge-base b/.tx/merge-base
index 639baba19..b79568c51 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Oct  6 07:23:29 CEST 2022
+Fri Dec 16 07:23:28 CET 2022