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

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

Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into Airmap
# Conflicts: # src/FlightDisplay/FlightDisplayViewWidgets.qml # src/PlanView/MissionItemEditor.qml # src/PlanView/RallyPointItemEditor.qml # src/QmlControls/QGCButton.qml # src/api/QGCOptions.h
15517ff3 · Gus Grubba · 7f89c8eb · 5957f29e · 15517ff3 · 15517ff3
Commit 15517ff3 authored Mar 14, 2018 by Gus Grubba
--- a/src/QmlControls/QGCPipable.qml
+++ b/src/QmlControls/QGCPipable.qml
--- a/src/QmlControls/QGCView.qml
+++ b/src/QmlControls/QGCView.qml
--- a/src/QmlControls/QGCViewDialog.qml
+++ b/src/QmlControls/QGCViewDialog.qml
--- a/src/QmlControls/QGroundControl.Controls.qmldir
+++ b/src/QmlControls/QGroundControl.Controls.qmldir
--- a/src/QmlControls/QmlTest.qml
+++ b/src/QmlControls/QmlTest.qml
--- a/src/QmlControls/ToolStrip.qml
+++ b/src/QmlControls/ToolStrip.qml
--- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml
+++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml
--- a/src/VehicleSetup/FirmwareUpgrade.qml
+++ b/src/VehicleSetup/FirmwareUpgrade.qml
--- a/src/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/VehicleSetup/FirmwareUpgradeController.cc
--- a/src/VehicleSetup/FirmwareUpgradeController.h
+++ b/src/VehicleSetup/FirmwareUpgradeController.h
--- a/src/VehicleSetup/JoystickConfig.qml
+++ b/src/VehicleSetup/JoystickConfig.qml
--- a/src/VehicleSetup/JoystickConfigController.cc
+++ b/src/VehicleSetup/JoystickConfigController.cc
--- a/src/VehicleSetup/VehicleSummary.qml
+++ b/src/VehicleSetup/VehicleSummary.qml
--- a/src/ViewWidgets/ViewWidget.qml
+++ b/src/ViewWidgets/ViewWidget.qml
--- a/src/api/QGCOptions.h
+++ b/src/api/QGCOptions.h
--- a/src/ui/MainWindowHybrid.qml
+++ b/src/ui/MainWindowHybrid.qml
--- a/src/ui/MainWindowInner.qml
+++ b/src/ui/MainWindowInner.qml