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)
1  2 
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

Simple merge
Simple merge
diff --cc bal-wep-xdf.cfg
Simple merge
Simple merge
diff --cc bal-wep-xpm.cfg
Simple merge
Simple merge