Merge branch 'master' into Mario/vaporizer_damage
authorMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 00:57:08 +0000 (11:57 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 00:57:08 +0000 (11:57 +1100)
commitdd7322820d42e8906543b742a7e341e538c30c05
tree954f90cfc1aefb0e0b1df154b68ca3a93a212515
parent2668c5d1a9de1d414597a14431861a0adb9dee2d
parent4c3cf7efc863be994bad18a855c771c0d1ded098
Merge branch 'master' into Mario/vaporizer_damage
bal-wep-nexuiz25.cfg
bal-wep-samual.cfg
bal-wep-xdf.cfg
bal-wep-xonotic.cfg
bal-wep-xpm.cfg
qcsrc/server/cl_player.qc
qcsrc/server/mutators/mutator_instagib.qc