X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=2673a4355b5413de661a73aa17aa7c4b5a90fb1d;hb=256ba81a03f67e5d14af36e36b2d1dcc58cee70a;hp=cad03ae669ccf13942c8bfdb86db840a17871dd4;hpb=658f02759864ffee0d43fc79d5da92ca138619e3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index cad03ae66..2673a4355 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Apr  8 07:23:09 CEST 2022
+Mon Jul  4 07:23:06 CEST 2022