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

2198cffd

Commit 2198cffd authored 13 years ago by pixhawk

Downloads
- Plain Diff

Merge branch 'v10release' of git://github.com/pixhawk/qgroundcontrol into v10release

parents a19cb4f7 c2fe813e

Branches

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/QGC.cc 40 additions, 16 deletions

src/QGC.cc
src/comm/MAVLinkSimulationLink.cc 3 additions, 3 deletions

src/comm/MAVLinkSimulationLink.cc
src/comm/MAVLinkSimulationWaypointPlanner.cc 3 additions, 3 deletions

src/comm/MAVLinkSimulationWaypointPlanner.cc
src/uas/UAS.cc 37 additions, 26 deletions

src/uas/UAS.cc
src/uas/UASManager.cc 20 additions, 0 deletions

src/uas/UASManager.cc
src/uas/UASManager.h 4 additions, 0 deletions

src/uas/UASManager.h
src/ui/HUD.cc 4 additions, 199 deletions

src/ui/HUD.cc
src/ui/MAVLinkDecoder.cc 0 additions, 1 deletion

src/ui/MAVLinkDecoder.cc

with 111 additions and 248 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