James Cotton 3155324384 Merge branch 'next' into cc3d ... Conflicts: Makefile ground/openpilotgcs/src/plugins/config/configahrswidget.cpp shared/uavobjectdefinition/ahrscalibration.xml shared/uavobjectdefinition/ahrssettings.xml shared/uavobjectdefinition/attituderaw.xml		2012-05-03 16:31:49 -05:00
..
inc	INS: First pass at altitude hold code	2011-09-13 01:44:53 -05:00
manualcontrol.c	Merge branch 'next' into cc3d	2012-05-03 16:31:49 -05:00