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

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

# Conflicts:
#	src/QmlControls/PIDTuning.qml
#	src/ui/MainWindow.cc
parents 0e7f614d df6e1a51
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 773 additions and 308 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