Merged master.
authorLyberta <lyberta@lyberta.net>
Sat, 5 Aug 2017 09:57:41 +0000 (12:57 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 5 Aug 2017 09:57:41 +0000 (12:57 +0300)
1  2 
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/sv_cmd.qc
qcsrc/server/player.qc

Simple merge
Simple merge
Simple merge
Simple merge