Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Sun, 9 Oct 2016 01:52:39 +0000 (11:52 +1000)
committerMario <mario@smbclan.net>
Sun, 9 Oct 2016 01:52:39 +0000 (11:52 +1000)
1  2 
qcsrc/common/physics/player.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
Simple merge