]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Sat, 23 Apr 2022 21:04:45 +0000 (17:04 -0400)
committerz411 <z411@omaera.org>
Sat, 23 Apr 2022 21:04:45 +0000 (17:04 -0400)
commit0ee3d5ec2de781711d03533aed4276b21240eebd
treede6beed61d4add5fae7bd9d163c3d6fbd25a1fa2
parent293816fd7ae542a53baf1aefb73d11ba10f1247d
parent79a8f0352d1b7b48232af94f020bb4f30f2fe79a
Merge branch 'master' into z411/bai-server
qcsrc/client/announcer.qc
qcsrc/client/hud/panel/centerprint.qc
qcsrc/client/hud/panel/centerprint.qh
qcsrc/client/main.qc
qcsrc/server/client.qc
qcsrc/server/command/vote.qc
qcsrc/server/teamplay.qc
qcsrc/server/world.qc