Merge branch 'master' into Lyberta/master

author Lyberta <lyberta@lyberta.net>

Fri, 17 Mar 2017 20:15:24 +0000 (23:15 +0300)

committer Lyberta <lyberta@lyberta.net>

Fri, 17 Mar 2017 20:15:24 +0000 (23:15 +0300)
author Lyberta <lyberta@lyberta.net>
Fri, 17 Mar 2017 20:15:24 +0000 (23:15 +0300)
committer Lyberta <lyberta@lyberta.net>
Fri, 17 Mar 2017 20:15:24 +0000 (23:15 +0300)
diff --cc bal-wep-overkill.cfg
Simple merge
diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
Simple merge
diff --cc qcsrc/common/stats.qh
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/mutators/events.qh
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Fri, 17 Mar 2017 20:15:24 +0000 (23:15 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Fri, 17 Mar 2017 20:15:24 +0000 (23:15 +0300)
		1	2
bal-wep-overkill.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/events.qh	patch \|	diff1 \|	diff2 \|	blob \| history