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)
commitcdfb5ccac250aac0633253e0f384e01f56a55bb6
tree56a64284bacc015e671a8111ec54e389b6803c4a
parent524d2e52f82e986764687989ec0075719a4c4cee
parentcc78077027a449f7440197953c3b21d6dc944565
Merge branch 'master' into Lyberta/mutator_is_enabled
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