Merge remote branch 'origin/fruitiex/cl_vyes'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 1 Dec 2010 20:14:31 +0000 (21:14 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 1 Dec 2010 20:14:31 +0000 (21:14 +0100)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
qcsrc/server/playerstats.qc

Simple merge
Simple merge
Simple merge
Simple merge