Merge branch 'master' into nyov/dedicated-startupscreen
authornyov <nyov@nexnode.net>
Sat, 3 Dec 2011 19:16:14 +0000 (20:16 +0100)
committernyov <nyov@nexnode.net>
Sat, 3 Dec 2011 19:16:14 +0000 (20:16 +0100)
commit63720f610fa262c3510804469af37ff024d444d4
treeac7a719be4fcdeb2f1b40bb6368d2535e687ddd0
parent2f2f32c627d106e4220be9c05dbad91f15f00c52
parentfbaa95e81c2a56ec3fe83d3a45381cd2b439d9d6
Merge branch 'master' into nyov/dedicated-startupscreen
defaultXonotic.cfg