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)
commit9d567c5701a3a4575a3388c71482906baf2e4ce3
tree1adb9d1882eb528bde0bba7b75a617f4abb25be0
parentbc9c0387bed9a396b7fa98cb810a54a54b6d040c
parent1122b2b962d5a3ee54b2157ce571ab2c0ae3656c
Merge remote branch 'origin/fruitiex/cl_vyes'
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
qcsrc/server/playerstats.qc