From: Mario <mario@smbclan.net>
Date: Sat, 20 Oct 2018 17:08:36 +0000 (+1000)
Subject: Merge branch 'master' into Mario/qcphysics_tweaks
X-Git-Tag: xonotic-v0.8.5~1754^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be8d35c9ec5e173f26db53b4b1a7b5fd0b746a60;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/qcphysics_tweaks
---

be8d35c9ec5e173f26db53b4b1a7b5fd0b746a60