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

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

# Conflicts:
#	src/FlightDisplay/GuidedActionsController.qml
#	src/PlanView/PlanView.qml
parents 6cc84cd5 28b58527
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