X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=75fa4f513b35a1788687cdc13a093a823bd35e4f;hb=34d9792792921aa1a305dfab9276f69f2eaa22e8;hp=01c17c1da2fec147244ca3d89244f2e68e1c2fbe;hpb=0e93de78c8838e353255bc7ffe30434adbdd1c58;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 01c17c1da..75fa4f513 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun 13 07:24:54 CEST 2021
+Sun Oct 31 07:23:44 CET 2021