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

98071529

Unverified Commit 98071529 authored 7 years ago by Don Gagne Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #6213 from DonLakeFlyer/StableMerge

Stable merge

parents 78be63ea ba0dce20

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/MissionManager/MissionManager.h 0 additions, 4 deletions

src/MissionManager/MissionManager.h
src/MissionManager/QGCMapPolygon.cc 14 additions, 3 deletions

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

src/MissionManager/QGCMapPolygon.h
src/MissionManager/SurveyMissionItem.cc 25 additions, 63 deletions

src/MissionManager/SurveyMissionItem.cc
src/MissionManager/SurveyMissionItem.h 0 additions, 1 deletion

src/MissionManager/SurveyMissionItem.h
src/PlanView/SurveyItemEditor.qml 1 addition, 0 deletions

src/PlanView/SurveyItemEditor.qml
src/QmlControls/QmlObjectListModel.cc 31 additions, 0 deletions

src/QmlControls/QmlObjectListModel.cc
src/QmlControls/QmlObjectListModel.h 8 additions, 6 deletions

src/QmlControls/QmlObjectListModel.h

with 80 additions and 77 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