Stacey Sheldon 754f58c33a Merge remote-tracking branch 'op-public/next' into revo-next ... Conflicts: flight/Modules/ManualControl/inc/manualcontrol.h flight/Revolution/Makefile.osx ground/openpilotgcs/src/plugins/plugins.pro ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp shared/uavobjectdefinition/flightstatus.xml shared/uavobjectdefinition/hwsettings.xml shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml		2012-09-16 09:56:35 -04:00
..
System	Merge remote-tracking branch 'op-public/next' into revo-next	2012-08-20 21:22:02 -04:00
Makefile	Merge branch 'next' into relay_tuning	2012-09-04 10:43:04 -05:00