Corvus Corax 6163c5f53a Merge branch 'next' into corvuscorax/OP-947_stateestimator-module ... Conflicts: flight/modules/AltitudeHold/altitudehold.c ground/openpilotgcs/share/openpilotgcs/pfd/default/AltitudeScale.qml ground/openpilotgcs/share/openpilotgcs/pfd/default/PfdIndicators.qml ground/openpilotgcs/share/openpilotgcs/pfd/default/SpeedScale.qml ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp		2013-06-22 18:44:03 +02:00
..
openpilotgcs	Merge branch 'next' into corvuscorax/OP-947_stateestimator-module	2013-06-22 18:44:03 +02:00
uavobject-synthetics	Normalize line endings	2013-04-07 09:49:13 +03:00
uavobjgenerator	Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES	2013-05-19 17:37:30 +03:00
.gitattributes	OP-910: fix line endings and whitespaces (didn't work on Linux)	2013-06-05 23:21:54 +03:00
ground.pro	Normalize line endings	2013-04-07 09:49:13 +03:00