Merge branch 'martin-t/kh' into martin-t/master2

author Martin Taibr <taibr.martin@gmail.com>

Mon, 26 Aug 2019 18:30:24 +0000 (20:30 +0200)

committer Martin Taibr <taibr.martin@gmail.com>

Mon, 26 Aug 2019 18:30:24 +0000 (20:30 +0200)
author Martin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:30:24 +0000 (20:30 +0200)
committer Martin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:30:24 +0000 (20:30 +0200)
diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
Simple merge
diff --cc qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
Simple merge
diff --cc qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
author	Martin Taibr <taibr.martin@gmail.com>
	Mon, 26 Aug 2019 18:30:24 +0000 (20:30 +0200)
committer	Martin Taibr <taibr.martin@gmail.com>
	Mon, 26 Aug 2019 18:30:24 +0000 (20:30 +0200)
		1	2
qcsrc/client/view.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/dodging/sv_dodging.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history