X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=e96b54a4568b56332f937ecb6227be6144fbcd29;hb=3a5ca47558391b7205fd8e920a936e7d3052e094;hp=eb1327868eefbb1ffbe8dc255278783242299895;hpb=c7d85168948d5ddad5b69d41116e58bcde49b694;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index eb1327868..e96b54a45 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Oct  8 07:23:29 CEST 2022
+Mon Dec 19 07:23:27 CET 2022