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

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

# Conflicts:
#	src/AutoPilotPlugins/APM/APMAirframeComponent.qml
#	src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
#	src/AutoPilotPlugins/APM/APMLightsComponent.qml
parents 059bb4c6 6982e89e
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