Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 11 Jun 2010 20:14:21 +0000 (23:14 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 11 Jun 2010 20:14:21 +0000 (23:14 +0300)
commit481667b4c4389cd5bb01b88f1ccab09fa4735d40
tree894d002cf866836cf7fb7c308ce3734dbd92542f
parent25f45feccc0f411ac02a1bb13f19c9c73083f9b2
parentf0010eda2d28007465da103d706b40a460eb582a
Merge branch 'master' into fruitiex/newpanelhud