Merge branch 'master' into terencehill/less_entities

author terencehill <piuntn@gmail.com>

Sun, 11 Aug 2019 13:41:17 +0000 (15:41 +0200)

committer terencehill <piuntn@gmail.com>

Sun, 11 Aug 2019 13:41:17 +0000 (15:41 +0200)
author terencehill <piuntn@gmail.com>
Sun, 11 Aug 2019 13:41:17 +0000 (15:41 +0200)
committer terencehill <piuntn@gmail.com>
Sun, 11 Aug 2019 13:41:17 +0000 (15:41 +0200)
diff --cc qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
Simple merge
diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Sun, 11 Aug 2019 13:41:17 +0000 (15:41 +0200)
committer	terencehill <piuntn@gmail.com>
	Sun, 11 Aug 2019 13:41:17 +0000 (15:41 +0200)
		1	2
qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/nades/nades.qc	patch \|	diff1 \|	diff2 \|	blob \| history