Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Sat, 8 Oct 2016 14:41:21 +0000 (00:41 +1000)
committerMario <mario@smbclan.net>
Sat, 8 Oct 2016 14:41:21 +0000 (00:41 +1000)
1  2 
mutators.cfg
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/nix/sv_nix.qc
qcsrc/common/t_items.qc
qcsrc/common/weapons/all.qc
qcsrc/common/weapons/weapon/fireball.qc
qcsrc/server/g_world.qc

diff --cc mutators.cfg
Simple merge
Simple merge
Simple merge
Simple merge