Merge remote branch 'origin/fruitiex/better_default_color'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 14 Dec 2010 06:55:23 +0000 (07:55 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 14 Dec 2010 06:55:23 +0000 (07:55 +0100)
1  2 
defaultXonotic.cfg

Simple merge