Merge branch 'master' into mirceakitsune/per_character_sounds
authorRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 13:04:19 +0000 (15:04 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 13:04:19 +0000 (15:04 +0200)
commitfef280899c7d1bb27078da823b0a64843b2f1129
tree88052c6f01509e33d83778dbe338080aa99da9a3
parentef7c4110c22af1dfc0e5807e640168ec3b57fd7a
parent3895948321c458b7acb3808206a3bfac99bcb917
Merge branch 'master' into mirceakitsune/per_character_sounds
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc