James Cotton c9f66f5145 Merge branch 'revo' 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 flight/PipXtreme/System/pios_board.c ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp shared/uavobjectdefinition/taskinfo.xml		2012-09-01 16:57:27 -05:00
..
uavobjectdefinition	Merge branch 'revo' into revo-mini	2012-09-01 16:57:27 -05:00