Merge branch 'master' into Mario/vaporizer_damage 215/head
authorMario <zacjardine@y7mail.com>
Mon, 31 Aug 2015 14:15:08 +0000 (00:15 +1000)
committerMario <zacjardine@y7mail.com>
Mon, 31 Aug 2015 14:15:08 +0000 (00:15 +1000)
commit86c9dc7c3696c329496b06375c1e79fb407401ce
treedb16305337b8dfa27d040eb151ffa5a3af470238
parent253cc10990569fd90917dba809ce03c90fc89336
parent33a622888e895b345d10f4625f7f84299565f95f
Merge branch 'master' into Mario/vaporizer_damage

# Conflicts:
# qcsrc/common/weapons/w_vaporizer.qc
# qcsrc/server/cl_player.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/server/cl_player.qc
qcsrc/server/mutators/mutator_instagib.qc
vehicles.cfg