Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Sat, 31 Dec 2016 01:00:59 +0000 (11:00 +1000)
committerMario <mario@smbclan.net>
Sat, 31 Dec 2016 01:00:59 +0000 (11:00 +1000)
1  2 
defaultXonotic.cfg
mutators.cfg
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/t_items.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/weapons/throwing.qc

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