Merge remote-tracking branch 'origin/terencehill/arena_stuff'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 13 Sep 2011 14:22:13 +0000 (16:22 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 13 Sep 2011 14:22:13 +0000 (16:22 +0200)
1  2 
qcsrc/server/cl_player.qc

Simple merge