X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=08bd4e98e1e36cbddb1603b691183e04f560f47c;hb=a9cabf567f86500f0360bfa9ba0f0b3f52eda41d;hp=9610344753b0212fc6bb7bd41e99de41c9aebf2b;hpb=c5a06da897591552454905cde8368b88f4dd3379;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 961034475..08bd4e98e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun  5 07:23:51 CEST 2022
+Sat Jul  9 07:23:10 CEST 2022