Merge tag 'xonotic-v0.6.0' into nyov/dedicated-startupscreen
authornyov <nyov@nexnode.net>
Fri, 9 Mar 2012 06:38:44 +0000 (07:38 +0100)
committernyov <nyov@nexnode.net>
Fri, 9 Mar 2012 06:38:44 +0000 (07:38 +0100)
Xonotic Release 0.6.0

1  2 
defaultXonotic.cfg

Simple merge