Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into foo
# Conflicts: # src/QmlControls/PIDTuning.qml # src/ui/MainWindow.cc
Showing
This diff is collapsed.
# Conflicts: # src/QmlControls/PIDTuning.qml # src/ui/MainWindow.cc