Merge branch 'terencehill/newpanelhud' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 4 Aug 2010 16:18:40 +0000 (19:18 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 4 Aug 2010 16:18:40 +0000 (19:18 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/miscfunctions.qc

Simple merge
Simple merge
Simple merge
Simple merge