Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Mon, 7 Jun 2010 17:29:41 +0000 (20:29 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Mon, 7 Jun 2010 17:29:41 +0000 (20:29 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/hud.qc

Simple merge
Simple merge
Simple merge