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

diff --git a/.tx/merge-base b/.tx/merge-base
index e1ffb97e3..e96b54a45 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec  4 07:24:05 CET 2022
+Mon Dec 19 07:23:27 CET 2022