Merge branch 'master' into nyov/dedicated-startupscreen
authornyov <nyov@nexnode.net>
Sat, 7 Jan 2012 19:43:48 +0000 (20:43 +0100)
committernyov <nyov@nexnode.net>
Sat, 7 Jan 2012 19:43:48 +0000 (20:43 +0100)
1  2 
defaultXonotic.cfg

Simple merge