Merge branch 'Mario/qcphysics_tweaks' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 20 Oct 2018 18:50:04 +0000 (18:50 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 20 Oct 2018 18:50:04 +0000 (18:50 +0000)
commitd0f6d7e5c6983c77bdf51b90dd48cd2c19a0e9a8
tree6ed404542fcc86e4004198336f3f952159a889b7
parente43068443a3d73fcd7d950a8f1a22571bfd92171
parent0711025377f4f466a41135b558ad62d9a7588d0e
Merge branch 'Mario/qcphysics_tweaks' into 'master'

Merge branch Mario/qcphysics_tweaks (S merge request)

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