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

0b00248c

Commit 0b00248c authored 7 years ago by Gus Grubba

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into alertMessage

* 'master' of https://github.com/mavlink/qgroundcontrol:
  Missed one
  Switch OS X to 5.7
  Change Plan sync model yet again

parents 7ab6707e a3129aa1

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 3 additions, 3 deletions

.travis.yml
src/MissionManager/MissionController.cc 12 additions, 66 deletions

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

src/MissionManager/MissionController.h
src/MissionManager/MissionSettings.FactMetaData.json 0 additions, 6 deletions

src/MissionManager/MissionSettings.FactMetaData.json
src/MissionManager/MissionSettingsItem.cc 2 additions, 23 deletions

src/MissionManager/MissionSettingsItem.cc
src/MissionManager/MissionSettingsItem.h 0 additions, 16 deletions

src/MissionManager/MissionSettingsItem.h
src/MissionManager/SimpleMissionItem.cc 10 additions, 1 deletion

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

src/MissionManager/SimpleMissionItem.h
src/PlanView/MissionSettingsEditor.qml 1 addition, 139 deletions

src/PlanView/MissionSettingsEditor.qml
src/PlanView/PlanToolBar.qml 5 additions, 4 deletions

src/PlanView/PlanToolBar.qml
src/PlanView/PlanView.qml 122 additions, 62 deletions

src/PlanView/PlanView.qml

with 157 additions and 332 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