Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 06:30:41 +0000 (08:30 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 06:30:41 +0000 (08:30 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc

Simple merge
Simple merge
Simple merge