Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 9 Jul 2010 19:41:59 +0000 (22:41 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 9 Jul 2010 19:41:59 +0000 (22:41 +0300)
commit5fca782f85c8971b23b76e610183dd273d4381b2
tree9af1ead1ca47f9f5d6cbb0efce36bb8cb5c2fbaa
parentd6e7721ae95a263fb54a178fe8a4cb7ff73f86df
parentede9885b965ca4e0d56277d7284a7d981a02ee4a
Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance