Merge remote-tracking branch 'origin/terencehill/gameover_killindicator'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Aug 2011 12:03:30 +0000 (14:03 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Aug 2011 12:03:30 +0000 (14:03 +0200)
1  2 
qcsrc/server/cl_client.qc

Simple merge