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)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc

Simple merge
Simple merge