Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 19 Oct 2011 20:20:15 +0000 (23:20 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 19 Oct 2011 20:20:15 +0000 (23:20 +0300)
1  2 
defaultXonotic.cfg
effectinfo.txt
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/damage.qc
qcsrc/common/constants.qh
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc

Simple merge
diff --cc effectinfo.txt
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge