Merge branches/froyo_12.03 to head.
authorkruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Wed, 18 Jul 2012 14:42:27 +0000 (14:42 +0000)
committerkruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Wed, 18 Jul 2012 14:42:27 +0000 (14:42 +0000)
commit953ac8ca75bc3bdcb9db8a382c7b3d63c795b27a
treeb2bccfd32d9e7b9a558c24f8dd95725267f89fbd
parenta71cee015ebb31174a72fdd12ecf74fae2a6164e
parentc9e07ce31c1d8ad6a1ca48f1f3234584210fc544
Merge branches/froyo_12.03 to head.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@899 180e2498-e6e9-4542-8430-84ac67f01cd8
android/AndroidManifest.xml
core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java