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

Merge branch 'Stable_V3.2' of https://github.com/mavlink/qgroundcontrol into cameraControl 

# Conflicts:
#	src/MissionManager/CameraSection.FactMetaData.json

Fixed missing "Survey" mode.
parents bd872361 2e155a4c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment