Merge branch 'master' into terencehill/CA_forbidspawn
authorterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 12:15:20 +0000 (14:15 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 12:15:20 +0000 (14:15 +0200)
commita491650510dce3f774cce457ebf15ddcafcf393f
tree1f1e24210b8d9302ed38d95b8298e4a4fb89d1d9
parent74a3a7c6b47ed4faf93c67718caeffa0eda8025e
parent5da6bc592812c014078f0eee3368773282659ff9
Merge branch 'master' into terencehill/CA_forbidspawn
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc