From: Mario <mario.mario@y7mail.com>
Date: Tue, 7 Jan 2020 14:40:04 +0000 (+0000)
Subject: Merge branch 'terencehill/frametime_checks' into 'master'
X-Git-Tag: xonotic-v0.8.5~1105^2~39
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3db2113eb80547da28988be0958bde321837efc1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/frametime_checks' into 'master'

Frametime checks

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

3db2113eb80547da28988be0958bde321837efc1