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-03 20:37:40 -07:00
2013-06-22 18:44:03 +02:00
2013-06-06 19:25:54 +02:00
2013-06-22 18:44:03 +02:00
2013-06-22 18:44:03 +02:00
2013-06-03 20:37:40 -07:00
2013-06-03 20:37:40 -07:00
2013-05-19 17:37:30 +03:00
2013-06-06 19:25:54 +02:00
2013-06-03 20:37:40 -07:00
2013-06-03 20:37:40 -07:00
2013-06-06 19:25:54 +02:00
2013-06-03 20:37:40 -07:00
2013-06-03 20:37:40 -07:00
2013-06-06 19:25:54 +02:00
2013-06-03 20:37:40 -07:00
2013-06-22 18:44:03 +02:00
2013-06-22 18:44:03 +02:00
2013-05-19 17:37:30 +03:00
2013-06-03 20:37:40 -07:00
2013-06-06 19:25:54 +02:00
2013-06-03 20:37:40 -07:00
2013-06-06 19:25:54 +02:00
2013-06-03 20:37:40 -07:00
2013-06-06 19:25:54 +02:00
2013-06-06 19:25:54 +02:00
2013-06-09 21:49:04 +02:00
2013-06-17 21:42:30 +02:00
2013-06-03 20:37:40 -07:00
2013-06-03 20:37:40 -07:00
2013-06-06 19:25:54 +02:00