Stacey Sheldon 1f1b240b2a Merge remote-tracking branch 'op-public/next' into revo-next ... Conflicts: shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/taskinfo.xml		2012-08-20 21:22:02 -04:00
..
inc	Added ReturnToBase flightmode and correct behaviour in ManualControl	2012-05-21 12:10:01 +02:00
manualcontrol.c	Merge remote-tracking branch 'op-public/next' into revo-next	2012-08-20 21:22:02 -04:00