Merge remote branch 'origin/fruitiex/loadscreen'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:17:14 +0000 (19:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:17:14 +0000 (19:17 +0200)
1  2 
defaultXonotic.cfg

Simple merge