Merge branch 'Mario/cs_clientcvars' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 9 Aug 2017 13:10:10 +0000 (13:10 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 9 Aug 2017 13:10:10 +0000 (13:10 +0000)
Merge branch Mario/cs_clientcvars (M merge request)

See merge request !458

1  2 
qcsrc/common/stats.qh
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/cmd.qc
qcsrc/server/g_subs.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/player.qc
qcsrc/server/weapons/tracing.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge