Merge branch 'master' into Mario/q3compat_sanity

author Mario <mario.mario@y7mail.com>

Sun, 1 Nov 2020 06:01:28 +0000 (16:01 +1000)

committer Mario <mario.mario@y7mail.com>

Sun, 1 Nov 2020 06:01:28 +0000 (16:01 +1000)
author Mario <mario.mario@y7mail.com>
Sun, 1 Nov 2020 06:01:28 +0000 (16:01 +1000)
committer Mario <mario.mario@y7mail.com>
Sun, 1 Nov 2020 06:01:28 +0000 (16:01 +1000)
diff --cc qcsrc/client/mapvoting.qc
Simple merge
diff --cc qcsrc/common/mapinfo.qc
Simple merge
diff --cc qcsrc/common/mapinfo.qh
Simple merge
diff --cc qcsrc/server/world.qc
Simple merge
diff --cc qcsrc/server/world.qh
Simple merge
author	Mario <mario.mario@y7mail.com>
	Sun, 1 Nov 2020 06:01:28 +0000 (16:01 +1000)
committer	Mario <mario.mario@y7mail.com>
	Sun, 1 Nov 2020 06:01:28 +0000 (16:01 +1000)
		1	2
qcsrc/client/mapvoting.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapinfo.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/world.qh	patch \|	diff1 \|	diff2 \|	blob \| history