Merge branch 'master' into terencehill/misc_bugfixes
authorterencehill <piuntn@gmail.com>
Sun, 4 Jul 2010 23:08:29 +0000 (01:08 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 4 Jul 2010 23:08:29 +0000 (01:08 +0200)
1  2 
defaultXonotic.cfg

Simple merge