Merge branch 'master' into Mario/movetype_push

author Mario <mario.mario@y7mail.com>

Sat, 11 Jul 2020 03:52:07 +0000 (13:52 +1000)

committer Mario <mario.mario@y7mail.com>

Sat, 11 Jul 2020 03:52:07 +0000 (13:52 +1000)
author Mario <mario.mario@y7mail.com>
Sat, 11 Jul 2020 03:52:07 +0000 (13:52 +1000)
committer Mario <mario.mario@y7mail.com>
Sat, 11 Jul 2020 03:52:07 +0000 (13:52 +1000)
diff --cc qcsrc/common/physics/movetypes/movetypes.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Sat, 11 Jul 2020 03:52:07 +0000 (13:52 +1000)
committer	Mario <mario.mario@y7mail.com>
	Sat, 11 Jul 2020 03:52:07 +0000 (13:52 +1000)