Merge branch 'master' into terencehill/newpanelhud-dom_points
authorFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 20:17:04 +0000 (23:17 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 20:17:04 +0000 (23:17 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc

Simple merge
Simple merge