Merge branch 'master' into Mario/vaporizer_damage
authorMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 23:00:17 +0000 (09:00 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 23:00:17 +0000 (09:00 +1000)
commit253cc10990569fd90917dba809ce03c90fc89336
tree6c700fcad11672e30b03db700779e4281b836c5a
parentdd7322820d42e8906543b742a7e341e538c30c05
parent4566767f430d7a15f918d80b234f04c71f929b4e
Merge branch 'master' into Mario/vaporizer_damage

Conflicts:
qcsrc/common/weapons/w_vaporizer.qc
bal-wep-xonotic.cfg
bal-wep-xpm.cfg
qcsrc/common/weapons/w_vaporizer.qc
qcsrc/server/cl_player.qc
qcsrc/server/mutators/mutator_instagib.qc