Merge branch 'bones_was_here/strafehud_jumpheight' into Juhu/strafehud-fixes

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index 9394904ad29c5c9d82a2c2f63da98b6a3e6d3f2e..894b2e1713e0464fde403ada1403d46a419eddf7 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun May 30 07:24:57 CEST 2021
+Mon Oct 11 07:23:13 CEST 2021