Skip to content
Commit 7eb9fbc6 authored by Gus Grubba's avatar Gus Grubba
Browse files

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

# Conflicts:
#	qgroundcontrol.qrc
#	src/Microhard/MicrohardSettings.qml
#	src/VehicleSetup/FirmwareUpgrade.qml
parents 745bec25 ef731572
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment