Merge branch 'master' into mirceakitsune/per_character_sounds
authorRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 15:35:35 +0000 (17:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 15:35:35 +0000 (17:35 +0200)
1  2 
qcsrc/server/cl_client.qc

Simple merge