James Cotton 3110678321 Merge branch 'dynamic_uavo_next' into revo ... Conflicts: androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.java androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp		2012-10-10 08:27:11 -05:00
..
arrays.xml	AndroidGCS: Remove the old fake telemetry	2012-10-10 00:22:21 -05:00
attrs.xml	AndroidGCS Tuning: Fix the callbacks for the scroll and edit boxes so both can work.	2012-08-29 03:19:49 -05:00
colors.xml	Added a simple PFD	2012-08-06 16:54:53 -05:00
strings.xml	Merge branch 'android' into revo-mini	2012-08-30 12:10:12 -05:00