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)
commit1c9d0b4994d43c970e3fa02f651b5f5d79765e5b
tree191836364e28d79f5624949480d0187aa650c078
parent0a9f0df82a38ef92a180424588c0788eaa3f3748
parentdbd8ff22dd47dcf10edcadee1144c6cd5ec9af5e
Merge branch 'master' into Mario/wepent_experimental
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