Merge branch 'master' into Mario/cts_respawn_clear 432/head
authorMario <mario@smbclan.net>
Tue, 4 Apr 2017 21:22:54 +0000 (07:22 +1000)
committerMario <mario@smbclan.net>
Tue, 4 Apr 2017 21:22:54 +0000 (07:22 +1000)
1  2 
qcsrc/server/client.qc
qcsrc/server/player.qc

Simple merge
Simple merge