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)
commitf03ecd022b871d302176764d819b1a07eeda7997
tree408f67806ce2a2ad56425c7c25ee38aa1e7e54d1
parent5d13bb6d83fda4d4b2c51d624ece3ab80ac264b5
parent19eeff94eee19c8ed811eab52fc1a6b539c9d91b
Merge branch 'master' into Mario/wepent_experimental
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