From: Mario <mario.mario@y7mail.com>
Date: Mon, 5 Oct 2020 09:52:46 +0000 (+0000)
Subject: Merge branch 'terencehill/fps_display_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~743
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b9511a177609328883037db2eaf3f1d9b35d5a3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/fps_display_fix' into 'master'

fps display fix

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

1b9511a177609328883037db2eaf3f1d9b35d5a3