]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/ca-prevent-observer
authorz411 <z411@omaera.org>
Mon, 17 Oct 2022 18:11:13 +0000 (15:11 -0300)
committerz411 <z411@omaera.org>
Mon, 17 Oct 2022 18:11:13 +0000 (15:11 -0300)
commit618e3cf2875c3fda919d8eb5a74f925e7628b7ee
tree52b474a81e4a780b55679f92a316001a3be4ef61
parent21f7e2cc52aedd9630dadac7ca657ba2a75b65ad
parent72b4ff9441a3ef38dc6dd8d595de7c475b5b858f
Merge branch 'master' into z411/ca-prevent-observer
gamemodes-server.cfg
qcsrc/client/main.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qh
qcsrc/server/world.qc
qcsrc/server/world.qh