]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/team_queue
authorz411 <z411@omaera.org>
Tue, 15 Aug 2023 17:36:27 +0000 (13:36 -0400)
committerz411 <z411@omaera.org>
Tue, 15 Aug 2023 17:36:27 +0000 (13:36 -0400)
commit00f3c0d8afc9d40af6806ff6492c67e5e2ada93d
tree9a91e0994eddde8a0c4501e86319ae00740db4e4
parent86ec2dbdb8ddd084c6ed82aa7f39b662b781247b
parent414abe43bfc7d7f8ce54ecb0a39ce9b049113ca2
Merge branch 'master' into z411/team_queue
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/ent_cs.qc
qcsrc/common/notifications/all.inc
qcsrc/server/client.qc
qcsrc/server/client.qh
qcsrc/server/command/cmd.qc
qcsrc/server/world.qc
xonotic-server.cfg