Merge remote branch 'refs/remotes/origin/mirceakitsune/death_unglow'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:14:01 +0000 (20:14 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:14:01 +0000 (20:14 +0200)
1  2 
defaultXonotic.cfg

Simple merge