From: terencehill <piuntn@gmail.com>
Date: Tue, 22 Jun 2021 14:45:50 +0000 (+0000)
Subject: Merge branch 'Mario/qcphysics_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.5~396
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0934ac7344041e9f2b677066803c5b0e12e5a60c

Merge branch 'Mario/qcphysics_fixes' into 'master'

Merge branch Mario/qcphysics_fixes (S merge request)

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

0934ac7344041e9f2b677066803c5b0e12e5a60c