Merge branch 'master' into divVerent/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Fri, 23 Jul 2010 18:25:21 +0000 (20:25 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 23 Jul 2010 18:25:21 +0000 (20:25 +0200)
1  2 
defaultXonotic.cfg

Simple merge