Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Tue, 6 Dec 2016 15:01:32 +0000 (01:01 +1000)
committerMario <mario@smbclan.net>
Tue, 6 Dec 2016 15:01:32 +0000 (01:01 +1000)
1  2 
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc
qcsrc/server/weapons/selection.qc

Simple merge
Simple merge
Simple merge