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 82d5b0c4fd209425494cb428b2a3a3de9ca97f52..0d8cd0829a84cb9ede460fd81562050b4d5274f4 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov 28 07:23:50 CET 2021
+Mon Feb  7 07:23:11 CET 2022