Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:11:55 +0000 (23:11 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:11:55 +0000 (23:11 +0300)
commit6c9278887b506ba1f4135a7ce2451706293938b3
treec62bcd565e284b1d57dadaf5d0614f8d8c9dcbaf
parentd6d052a48359a46ac57774650797e6cc6a6d7f31
parentbdfd71723a38e659cf26a894e07d8f77a5a1e79f
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh