Merge branch 'master' into Lyberta/TeamplayFixes_
authorLyberta <lyberta@lyberta.net>
Sat, 3 Jun 2017 19:56:26 +0000 (22:56 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 3 Jun 2017 19:56:26 +0000 (22:56 +0300)
1  2 
qcsrc/server/client.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc
qcsrc/server/player.qh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge