Merge remote-tracking branch 'origin/nyov/dedicated-startupscreen'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 12 Mar 2012 09:24:38 +0000 (10:24 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 12 Mar 2012 09:24:38 +0000 (10:24 +0100)
1  2 
defaultXonotic.cfg

Simple merge