James Cotton
69328edd0d
Merge branch 'android' into revo-mini
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/values/strings.xml
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
androidgcs/src/org/openpilot/androidgcs/HomePage.java
2012-08-30 12:10:12 -05:00
..
2012-08-30 12:10:12 -05:00
2012-08-06 16:55:02 -05:00
2012-08-06 16:55:02 -05:00
2012-08-06 16:55:02 -05:00
2012-08-06 16:55:00 -05:00
2012-08-28 13:48:13 -05:00
2012-08-06 16:54:58 -05:00
2012-08-06 16:54:58 -05:00
2012-08-06 16:55:02 -05:00
2012-08-28 13:48:13 -05:00
2012-08-06 16:55:02 -05:00
2012-08-30 01:01:53 -05:00
2012-08-30 01:01:53 -05:00
2012-08-30 01:01:53 -05:00
2012-08-10 10:15:32 -05:00
2012-08-10 10:15:32 -05:00
2012-08-10 10:15:32 -05:00
2012-08-10 10:15:32 -05:00