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 26b89722f27d171f3351c8191a7b21ecd89e9dc8..0d8cd0829a84cb9ede460fd81562050b4d5274f4 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jul 20 07:23:32 CEST 2021
+Mon Feb  7 07:23:11 CET 2022