]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/team_queue
authorz411 <z411@omaera.org>
Tue, 16 May 2023 16:30:40 +0000 (12:30 -0400)
committerz411 <z411@omaera.org>
Tue, 16 May 2023 16:30:40 +0000 (12:30 -0400)
commitb0e75a28e714bb924ef417a34c83664d0b9e1422
treee6cdb0b7b6ccbf69497243f9ee52e69e17d6d416
parent59f4902dff0a8c1c4f4640cca9df70b3e0da84e7
parentfaff572805aaa88ca116015aa54c48dbb04d4b9c
Merge branch 'master' into z411/team_queue
qcsrc/common/notifications/all.inc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/teamplay.qc