James Cotton 2f65fc1e8e Merge branch 'next' into relay_tuning ... Conflicts: shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml		2012-09-04 10:43:04 -05:00
..
uavobjectdefinition	Merge branch 'next' into relay_tuning	2012-09-04 10:43:04 -05:00