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
..
2013-06-05 20:40:49 +02:00
2013-05-19 17:37:30 +03:00
2013-04-25 13:13:36 +03:00
2013-04-25 13:13:36 +03:00
2013-05-19 17:37:30 +03:00
2013-05-19 17:37:30 +03:00
2013-06-05 20:40:49 +02:00
2013-05-19 17:37:30 +03:00
2013-06-05 17:52:49 +02:00
2013-05-19 17:37:30 +03:00
2013-05-19 17:37:30 +03:00
2013-05-26 15:48:02 +10:00
2013-05-19 17:37:30 +03:00
2013-05-19 17:37:30 +03:00
2013-05-19 17:37:30 +03:00
2013-06-20 19:39:19 +02:00
2013-05-19 17:37:30 +03:00
2013-05-19 17:37:30 +03:00