Merge branch 'master' into Lyberta/mutator_is_enabled
authorLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)
1  2 
qcsrc/common/mutators/mutator/nix/sv_nix.qc
qcsrc/common/mutators/mutator/pinata/sv_pinata.qc
qcsrc/server/client.qc
qcsrc/server/g_damage.qc

Simple merge
Simple merge