James Cotton 96c2d24253 Merge branch 'next' into camera_stabilization ... Conflicts: flight/CopterControl/Makefile flight/CopterControl/System/coptercontrol.c flight/Modules/Actuator/actuator.c flight/Modules/GPS/GPS.c flight/Modules/ManualControl/manualcontrol.c flight/Modules/Stabilization/stabilization.c flight/Modules/System/systemmod.c shared/uavobjectdefinition/manualcontrolsettings.xml shared/uavobjectdefinition/stabilizationdesired.xml		2011-07-30 10:06:10 +09:00
..
inc	OP-265 Flight reorganization of UAVObjects and Modules up a directory	2011-01-14 01:38:19 +00:00
firmwareiap.c	Merge branch 'next' into camera_stabilization	2011-07-30 10:06:10 +09:00