Richard Flay (Hyper) 87fcf9fa8b Merge branch 'next' into hyper/OP-931_extra_compiler_warnings and update as necessary. ... Hopefully properly fixes conflicts: flight/modules/Attitude/attitude.c flight/modules/ManualControl/manualcontrol.c flight/modules/Osd/WavPlayer/wavplayer.c flight/modules/Osd/osdgen/osdgen.c flight/modules/System/systemmod.c ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp		2013-05-04 11:12:44 +09:30
..
generators	Merge branch 'next' into hyper/OP-931_extra_compiler_warnings and update as necessary.	2013-05-04 11:12:44 +09:30
main.cpp	Added a backwards-compatible way to specify UAVO field element names and options as lists of child elements of the field element. Added the ability to specify that a field is a clone of another field, just with a different name	2012-09-08 14:41:55 +09:30
uavobjectparser.cpp	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00
uavobjectparser.h	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00
uavobjgenerator.pro	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00