Merge branch 'master' into mirceakitsune/per_character_sounds
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 4 May 2010 13:43:55 +0000 (16:43 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 4 May 2010 13:43:55 +0000 (16:43 +0300)
commit4bac00fdbd1726c76efffcada6253259762f83c6
tree5a5b0b21a832c925bf10a825bc7b522974a35b74
parent1ab0dddaa455a42fa42ac3e6bd1b3c7a75bbfaed
parent606b7d7b27c6ecd120f68730fc55dcc439dfeabb
Merge branch 'master' into mirceakitsune/per_character_sounds
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc