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 46c1a5ef7295669154902c294452a9fc92c18eed..0d8cd0829a84cb9ede460fd81562050b4d5274f4 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jan 16 07:23:33 CET 2022
+Mon Feb  7 07:23:11 CET 2022