James Cotton d150fd5331 Merge branch 'next' into revo ...

Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
	shared/uavobjectdefinition/manualcontrolsettings.xml

2012-07-13 10:40:14 -05:00

..

inc

Add a RTH flight mode and remove it from the waypoint actions as that is

2012-06-03 22:14:11 -05:00

manualcontrol.c

Merge branch 'next' into revo

2012-07-13 10:40:14 -05:00