James Cotton 38e9d105aa Merge branch 'pidt1' into test2 ... Conflicts: flight/Modules/ManualControl/inc/manualcontrol.h ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro shared/uavobjectdefinition/flightstatus.xml shared/uavobjectdefinition/hwsettings.xml shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml		2012-09-10 14:37:52 -05:00
..
manualcontrol.h	Merge branch 'pidt1' into test2	2012-09-10 14:37:52 -05:00