X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=ab25dedfc6c80eb8ad1a0e59af1e1cfbc84339df;hb=c01ccaf7526bdb08eba9803c211efbf79bf5af92;hp=59b526acbb2d92ea5e10b889d4197dddacd46ba7;hpb=5283dbcf2846307cfc494deee8d80a32bf3dfe9f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 59b526acb..ab25dedfc 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Apr 10 07:23:45 CEST 2022
+Tue Aug  9 07:23:13 CEST 2022