Merge branch 'master' into z411/team_queue

author z411 <z411@omaera.org>

Tue, 16 May 2023 16:30:40 +0000 (12:30 -0400)

committer z411 <z411@omaera.org>

Tue, 16 May 2023 16:30:40 +0000 (12:30 -0400)
author z411 <z411@omaera.org>
Tue, 16 May 2023 16:30:40 +0000 (12:30 -0400)
committer z411 <z411@omaera.org>
Tue, 16 May 2023 16:30:40 +0000 (12:30 -0400)
diff --cc qcsrc/common/notifications/all.inc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/client.qh
Simple merge
diff --cc qcsrc/server/teamplay.qc
Simple merge
author	z411 <z411@omaera.org>
	Tue, 16 May 2023 16:30:40 +0000 (12:30 -0400)
committer	z411 <z411@omaera.org>
	Tue, 16 May 2023 16:30:40 +0000 (12:30 -0400)
		1	2
qcsrc/common/notifications/all.inc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	patch \|	diff1 \|	diff2 \|	blob \| history