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)
commitc7809f1cf117eb207add4956bac3b3d9233101b3
treee7b56e1462b5c4fb4087ba3e9a87efcee444d445
parent63720f610fa262c3510804469af37ff024d444d4
parentc5d2e002cfd511eaf1b1267ab49cd90161f08052
Merge branch 'master' into nyov/dedicated-startupscreen
defaultXonotic.cfg