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)
commit63de1215428d078d5fb2021c49edf59a7900cef9
tree56ec9e7c08f7edbd1fd1d0e46c78a82ffa6361d4
parent6d316974710a435f3c5bb21dc6e6faca0571154d
parentb6b68fad0ba8fb6901de0fcb14774b709696d8bc
Merge branch 'master' into Mario/cts_respawn_clear
qcsrc/server/client.qc
qcsrc/server/player.qc