From: Mario <mario.mario@y7mail.com>
Date: Sat, 18 Jul 2020 17:18:17 +0000 (+0000)
Subject: Merge branch 'terencehill/noclip_death_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~847
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=19c09c8cfc6a4cb71c07e63bf739b7720ec6b0a0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/noclip_death_fix' into 'master'

Noclip death fix

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

19c09c8cfc6a4cb71c07e63bf739b7720ec6b0a0