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)
commit9ee59809ded787f0b1d87440ada386b4a600adb1
tree1ca87a9011ccd191d9e7c56b508302213aca6596
parent50745c9c1ae774345ba331801a6835c4ed4210ff
parentc5da4e8d630ebc1c024ca30070583574a46252c2
Merge branch 'master' into divVerent/fruitbalance
defaultXonotic.cfg