Merge remote branch 'origin/fruitiex/fullbrightskin'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 17 Nov 2010 20:40:30 +0000 (21:40 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 17 Nov 2010 20:40:30 +0000 (21:40 +0100)
1  2 
defaultXonotic.cfg

Simple merge