Merge branch 'master' into Lyberta/mutator_is_enabled

author Lyberta <lyberta@lyberta.net>

Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)

committer Lyberta <lyberta@lyberta.net>

Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)
author Lyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)
committer Lyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)
diff --cc qcsrc/common/mutators/mutator/nix/sv_nix.qc
Simple merge
diff --cc qcsrc/common/mutators/mutator/pinata/sv_pinata.qc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/g_damage.qc
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Wed, 6 Jun 2018 00:45:24 +0000 (03:45 +0300)
		1	2
qcsrc/common/mutators/mutator/nix/sv_nix.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/pinata/sv_pinata.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	patch \|	diff1 \|	diff2 \|	blob \| history