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

Simple merge
Simple merge
Simple merge