src/FlightDisplay/FlightDisplayView.qml · 15517ff344f597e2a197b3a452fcbbe4d3597da1 · Valentin Platzgummer / qgroundcontrol

Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into Airmap · 15517ff3

Gus Grubba authored Mar 14, 2018

# Conflicts:
#	src/FlightDisplay/FlightDisplayViewWidgets.qml
#	src/PlanView/MissionItemEditor.qml
#	src/PlanView/RallyPointItemEditor.qml
#	src/QmlControls/QGCButton.qml
#	src/api/QGCOptions.h

15517ff3

FlightDisplayView.qml 29.8 KB

Replace FlightDisplayView.qml