From: terencehill <piuntn@gmail.com>
Date: Sat, 11 Jun 2022 23:35:24 +0000 (+0000)
Subject: Merge branch 'drjaska/catimelimit' into 'master'
X-Git-Tag: xonotic-v0.8.5~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0896f3ad07e80af9cc46f4d48960ea048a55617;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/catimelimit' into 'master'

Whitelist g_*_round_timelimit

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

c0896f3ad07e80af9cc46f4d48960ea048a55617