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

diff --git a/.tx/merge-base b/.tx/merge-base
index 210bacdd7..ab25dedfc 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Apr 16 07:23:09 CEST 2022
+Tue Aug  9 07:23:13 CEST 2022