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-06 16:54:54 -05:00
2012-08-06 16:54:54 -05:00
2012-08-21 15:24:07 -05:00
2012-08-06 16:54:53 -05:00
2012-08-23 11:20:01 -05:00
2012-08-30 12:10:12 -05:00
2012-08-30 12:10:12 -05:00
2012-08-16 03:44:11 -05:00
2012-08-06 16:54:54 -05:00
2012-08-06 16:54:17 -05:00
2012-08-30 12:10:12 -05:00
2012-08-06 16:54:54 -05:00
2012-08-06 16:54:54 -05:00
2012-08-04 21:00:25 -05:00