From: terencehill <piuntn@gmail.com>
Date: Sun, 2 Jan 2022 18:43:48 +0000 (+0000)
Subject: Merge branch 'z411/timer_bound' into 'master'
X-Git-Tag: xonotic-v0.8.5~247
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e6905a36d1f6320a5543efe8e2e7e6b0c069cef;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'z411/timer_bound' into 'master'

Added upper bound for decreasing timer

See merge request xonotic/xonotic-data.pk3dir!960
---

3e6905a36d1f6320a5543efe8e2e7e6b0c069cef