Merge remote branch 'origin/mirceakitsune/new_loading_screens'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:13:40 +0000 (10:13 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:13:40 +0000 (10:13 +0200)
1  2 
defaultXonotic.cfg

Simple merge