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

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

# Conflicts:
#	libs/mavlink/include/mavlink/v2.0
#	src/QmlControls/QmlObjectListModel.h
parents ab0f772c 9b9b9d74
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