Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Sat, 9 Oct 2010 08:57:25 +0000 (11:57 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sat, 9 Oct 2010 08:57:25 +0000 (11:57 +0300)
commita69eeebfc4fe8c4fb1c9dc375d5a6b1aa5cf7dbd
tree798611ed6f8326371bf79730594592339a820be3
parenta4e566d38ae0ea38f9737fef49e25c3b12556b6a
parentcb1743b559bd61735945591fc29b870f2ba48b85
Merge branch 'master' into fruitiex/fruitbalance
balanceLeeStricklin.cfg
defaultXonotic.cfg