Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Wed, 21 Dec 2016 07:43:38 +0000 (17:43 +1000)
committerMario <mario@smbclan.net>
Wed, 21 Dec 2016 07:43:38 +0000 (17:43 +1000)
1  2 
qcsrc/common/physics/player.qc

Simple merge