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

2a777cc8

Commit 2a777cc8 authored 7 years ago by Gus Grubba

Downloads
- Plain Diff

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

parents aa490d2c bd287607

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/FlightDisplay/FlightDisplayView.qml 3 additions, 2 deletions

src/FlightDisplay/FlightDisplayView.qml
src/FlightDisplay/GuidedActionsController.qml 56 additions, 47 deletions

src/FlightDisplay/GuidedActionsController.qml
src/MissionManager/MissionController.cc 1 addition, 0 deletions

src/MissionManager/MissionController.cc
src/MissionManager/MissionController.h 1 addition, 0 deletions

src/MissionManager/MissionController.h
src/MissionManager/MissionManager.cc 11 additions, 7 deletions

src/MissionManager/MissionManager.cc
src/MissionManager/MissionManager.h 1 addition, 0 deletions

src/MissionManager/MissionManager.h
src/QGCApplication.cc 5 additions, 0 deletions

src/QGCApplication.cc
src/QGCApplication.h 3 additions, 0 deletions

src/QGCApplication.h
src/QtLocationPlugin/QGCTileCacheWorker.cpp 1 addition, 1 deletion

src/QtLocationPlugin/QGCTileCacheWorker.cpp

with 82 additions and 57 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