Merge branch 'drjaska/timerbounding' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index e0af595d2629c90fc3600c1494fc58efb64e3784..0d8cd0829a84cb9ede460fd81562050b4d5274f4 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct 17 07:23:48 CEST 2021
+Mon Feb  7 07:23:11 CET 2022