Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Fri, 16 Jul 2010 00:19:55 +0000 (02:19 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 16 Jul 2010 00:19:55 +0000 (02:19 +0200)
1  2 
defaultXonotic.cfg

Simple merge