1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
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
..
2011-11-14 16:05:10 +02:00
2012-01-29 04:30:43 +11:00
2012-01-07 05:43:20 +11:00
2011-05-06 15:16:14 +10:00
2012-06-24 06:54:24 +10:00