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)
commit7f042267d93f57719b68f0725af14d444f5c8932
tree7808f0624c85c8313f82490c57a9b098e317ba84
parentfde04a29ed6f249c904737ae21ff44f400f1f453
parentc672b1e9be3eb074baa59a9c49009cbf99ad4b91
Merge branch 'master' into Mario/wepent_experimental
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