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)
commitbc6fe08d1d10d513d52efb1ab57a27d6086b8397
treea474d8e7d0b281a99bf3d8789f6b6998b9207ab9
parent1c9d0b4994d43c970e3fa02f651b5f5d79765e5b
parent2a7cd07cbcee2a9ef404bb81c293b9e393f65f19
Merge branch 'master' into Mario/wepent_experimental
qcsrc/common/physics/player.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh