Merge remote-tracking branch 'origin/master' into samual/menu_updates
authorRudolf Polzer <divverent@alientrap.org>
Wed, 25 Jan 2012 18:20:42 +0000 (19:20 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 25 Jan 2012 18:20:42 +0000 (19:20 +0100)
1  2 
defaultXonotic.cfg

Simple merge