]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/arc-beam_more_fixes
authorterencehill <piuntn@gmail.com>
Wed, 9 Oct 2024 18:05:07 +0000 (20:05 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 9 Oct 2024 18:11:48 +0000 (20:11 +0200)
commit09252d92715ee68804485c76bd4fd76d906da5df
tree6dcd30ed1646ade53f434b32779b32abcb57db8b
parente83650a868df7b0697db2cae254c827c1bf6c12d
parent2408c43def075495a86849e4d955882ee6c02ae3
Merge branch 'master' into terencehill/arc-beam_more_fixes

# Conflicts:
# qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/arc.qh
qcsrc/server/client.qc