Skip to content
Snippets Groups Projects
Commit 2929f008 authored by Gus Grubba's avatar Gus Grubba
Browse files

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

# Conflicts:
#	src/Vehicle/Vehicle.cc
#	src/api/QGCCorePlugin.cc
parents 587c42a7 70f899c6
Hide whitespace changes
Inline Side-by-side
Showing
with 207 additions and 131 deletions
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