Merge remote branch 'origin/fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 21:30:10 +0000 (00:30 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 21:30:10 +0000 (00:30 +0300)
1  2 
qcsrc/client/Main.qc
qcsrc/client/hud.qc

Simple merge
Simple merge