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

..

uavobjectdefinition

Merge branch 'next' into corvuscorax/OP-947_stateestimator-module

2013-06-22 18:44:03 +02:00

.gitattributes

Normalize line endings

2013-04-07 09:49:13 +03:00