From: Mario <zacjardine@y7mail.com>
Date: Sat, 20 Oct 2018 18:50:04 +0000 (+0000)
Subject: Merge branch 'Mario/qcphysics_tweaks' into 'master'
X-Git-Tag: xonotic-v0.8.5~1754
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d0f6d7e5c6983c77bdf51b90dd48cd2c19a0e9a8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/qcphysics_tweaks' into 'master'

Merge branch Mario/qcphysics_tweaks (S merge request)

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

d0f6d7e5c6983c77bdf51b90dd48cd2c19a0e9a8