Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 21 May 2011 12:14:28 +0000 (15:14 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 21 May 2011 12:14:28 +0000 (15:14 +0300)
commitdd1c17f2775c0249509992ee85edb71020fa09e9
treeb26b53c138391a09170b83b6b2dfb6eca2b02a09
parent6c9278887b506ba1f4135a7ce2451706293938b3
parent2e23497bba19bf2944a5b5306d537e7b7021e688
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
qcsrc/server/miscfunctions.qc