]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/misc_tweaks
authorMario <mario.mario@y7mail.com>
Sun, 25 Sep 2022 13:40:45 +0000 (23:40 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 25 Sep 2022 13:40:45 +0000 (23:40 +1000)
commit4f69ac9ffcb4389d325c7d0956760b3b29200c10
treec990735fa8b0cdf7c508f084af87ef2f8ec7da0c
parent104a469b2b014d9a869d5d85d500c33eb7ad59f3
parente94c6d31c461f91547569c54924f146f30ca7bbb
Merge branch 'master' into Mario/misc_tweaks
qcsrc/client/announcer.qc
qcsrc/client/main.qc
qcsrc/client/main.qh
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/util.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/server/client.qc
qcsrc/server/intermission.qc
qcsrc/server/scores.qc
qcsrc/server/world.qc