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)
commit81389844a546e48635a119927ffcf6e1ee15f689
treebb83a8179df02aafe26fdc420d487c6420864aac
parentdee2594bc4afa62147d64d691c30d200dbbcc693
parente95ef7f12c33a0537860f97a990b1c6ec7870660
Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc