Merge branch 'master' into Mario/csqc_muzzleflash
authorMario <mario.mario@y7mail.com>
Tue, 7 Jul 2020 11:13:57 +0000 (21:13 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 7 Jul 2020 11:13:57 +0000 (21:13 +1000)
1  2 
qcsrc/common/effects/all.qc
qcsrc/common/effects/all.qh
qcsrc/common/mutators/mutator/overkill/okhmg.qc
qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/weapon/arc.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/common/weapons/weapon/vaporizer.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge