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 a7a5dfbddb5c22ef7f16bbc99e18215b752347cf..894b2e1713e0464fde403ada1403d46a419eddf7 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon May 31 07:23:32 CEST 2021
+Mon Oct 11 07:23:13 CEST 2021