An error occurred while loading the file. Please try again.

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

Gus Grubba authored 7 years ago

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

15517ff3