Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qgroundcontrol
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

bd872361

Commit bd872361 authored 7 years ago by Gus Grubba

Downloads
- Plain Diff

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

parents dbf4cd4d ee83b76b

Branches

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

android/AndroidManifest.xml 1 addition, 1 deletion

android/AndroidManifest.xml
src/FlightDisplay/GuidedActionsController.qml 4 additions, 2 deletions

src/FlightDisplay/GuidedActionsController.qml
src/MissionManager/MissionManager.cc 51 additions, 71 deletions

src/MissionManager/MissionManager.cc
src/MissionManager/SurveyMissionItem.cc 6 additions, 2 deletions

src/MissionManager/SurveyMissionItem.cc
src/PlanView/SurveyItemEditor.qml 18 additions, 0 deletions

src/PlanView/SurveyItemEditor.qml
src/QtLocationPlugin/QMLControl/OfflineMap.qml 0 additions, 2 deletions

src/QtLocationPlugin/QMLControl/OfflineMap.qml

with 80 additions and 78 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment