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

diff --git a/.tx/merge-base b/.tx/merge-base
index e1ffb97e3..76cee3439 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec  4 07:24:05 CET 2022
+Mon Dec 26 07:23:44 CET 2022