Merge branch 'master' into fruitiex/racefixes
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 11:02:13 +0000 (14:02 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 11:02:13 +0000 (14:02 +0300)
commit750e508d36f7d088f7d63035255b137a798bc566
tree6fe68bf2972b3816c07d5d8341dfe82582ab642b
parenta47d89ba39f02e78d8e58914f23f38d8c0012e88
parenta83b99f70b5e102960fd6a8acb48c40f07d43b43
Merge branch 'master' into fruitiex/racefixes
defaultXonotic.cfg