Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Mon, 17 Oct 2016 13:37:30 +0000 (23:37 +1000)
committerMario <mario@smbclan.net>
Mon, 17 Oct 2016 13:37:30 +0000 (23:37 +1000)
1  2 
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/physics/player.qc

Simple merge