Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

author Lyberta <lyberta@lyberta.net>

Tue, 24 Apr 2018 19:09:38 +0000 (22:09 +0300)

committer Lyberta <lyberta@lyberta.net>

Tue, 24 Apr 2018 19:09:38 +0000 (22:09 +0300)
author Lyberta <lyberta@lyberta.net>
Tue, 24 Apr 2018 19:09:38 +0000 (22:09 +0300)
committer Lyberta <lyberta@lyberta.net>
Tue, 24 Apr 2018 19:09:38 +0000 (22:09 +0300)
diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc xonotic-server.cfg
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Tue, 24 Apr 2018 19:09:38 +0000 (22:09 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Tue, 24 Apr 2018 19:09:38 +0000 (22:09 +0300)
		1	2
qcsrc/client/view.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	patch \|	diff1 \|	diff2 \|	blob \| history