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:58 -05:00
2012-08-06 16:54:58 -05:00
2012-08-30 12:10:12 -05:00
2012-08-06 16:55:01 -05:00
2012-08-06 16:55:00 -05:00
2012-08-08 19:15:03 -05:00
2012-08-29 22:59:10 -05:00
2012-08-06 16:54:58 -05:00
2012-08-06 16:54:53 -05:00
2012-08-08 12:20:29 -05:00
2012-08-08 08:37:35 -05:00
2012-08-08 15:50:28 -05:00
2012-08-06 16:55:02 -05:00
2012-08-06 16:54:52 -05:00
2012-08-29 03:19:49 -05:00
2012-08-21 00:04:26 -05:00