Merge branch 'master' into terencehill/essential_weapons_panel
authorterencehill <piuntn@gmail.com>
Wed, 13 Jul 2011 20:30:13 +0000 (22:30 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 13 Jul 2011 20:30:13 +0000 (22:30 +0200)
1  2 
defaultXonotic.cfg

Simple merge