Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Wed, 24 Nov 2010 14:15:08 +0000 (15:15 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 24 Nov 2010 14:15:08 +0000 (15:15 +0100)
1  2 
defaultXonotic.cfg

Simple merge