Merge branch 'master' into terencehill/lms_updates

author terencehill <piuntn@gmail.com>

Thu, 17 Jun 2021 12:18:15 +0000 (14:18 +0200)

committer terencehill <piuntn@gmail.com>

Thu, 17 Jun 2021 12:18:15 +0000 (14:18 +0200)
author terencehill <piuntn@gmail.com>
Thu, 17 Jun 2021 12:18:15 +0000 (14:18 +0200)
committer terencehill <piuntn@gmail.com>
Thu, 17 Jun 2021 12:18:15 +0000 (14:18 +0200)
diff --cc gamemodes-server.cfg
Simple merge
diff --cc qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
Simple merge
diff --cc qcsrc/common/mutators/mutator/waypoints/all.inc
Simple merge
author	terencehill <piuntn@gmail.com>
	Thu, 17 Jun 2021 12:18:15 +0000 (14:18 +0200)
committer	terencehill <piuntn@gmail.com>
	Thu, 17 Jun 2021 12:18:15 +0000 (14:18 +0200)
		1	2
gamemodes-server.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/all.inc	patch \|	diff1 \|	diff2 \|	blob \| history