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

..

generators

Merge branch 'next' into cc3d

2012-05-03 16:31:49 -05:00

main.cpp

UAVObjGenerator: Allow generation of specific UAVObjects only per commandline specified list - possibly needed for CopterControl

2011-01-28 22:35:44 +00:00

uavobjectparser.cpp

Merge branch 'next' into cc3d

2012-05-03 16:31:49 -05:00

uavobjectparser.h

Fixed metadata settings in object browswer, and removed update mode never from all uavobjects that used it (changed to manual).

2012-04-21 11:59:14 -07:00

uavobjgenerator.pro

uavobjgenerator: Move generator out of the gcs subdir

2011-01-22 17:38:37 +00:00