Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 3 Jan 2012 19:20:46 +0000 (21:20 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 3 Jan 2012 19:20:46 +0000 (21:20 +0200)
commitc6c371883dde697e1f237d498c08e09788b6af6b
tree1cb9746f91a87a8889d7eac77913bd45af6ab2c5
parenta8f44b0e98aedacaae872b937ee023e24fc30878
parent6796c18deac69d942dfc65b88efb2a5d9b258608
Merge branch 'master' into mirceakitsune/damage_effects

Conflicts:
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/common/constants.qh
qcsrc/server/cl_player.qc
defaultXonotic.cfg
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/gibs.qc
qcsrc/common/constants.qh
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc