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)
commit687a42edc07762ab7b176c6d2af5d0f7cec97147
treee21459e55c4cc05e8e3485633024f8784cefce30
parentc7809f1cf117eb207add4956bac3b3d9233101b3
parentae62eb7b0a48758de854556a9f1a1d580df36cfc
Merge tag 'xonotic-v0.6.0' into nyov/dedicated-startupscreen

Xonotic Release 0.6.0
defaultXonotic.cfg