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

6107c889

Commit 6107c889 authored 13 years ago by hengli

Downloads
- Plain Diff

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

parents 77f6b92c fcd302d7

Branches

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

files/pixhawk/hexarotor/widgets/mavconn.qgw 27 additions, 3 deletions

files/pixhawk/hexarotor/widgets/mavconn.qgw
src/comm/MAVLinkProtocol.cc 1 addition, 0 deletions

src/comm/MAVLinkProtocol.cc
src/uas/UAS.cc 4 additions, 1 deletion

src/uas/UAS.cc
src/uas/UASWaypointManager.cc 5 additions, 0 deletions

src/uas/UASWaypointManager.cc
src/uas/UASWaypointManager.h 1 addition, 0 deletions

src/uas/UASWaypointManager.h
src/ui/WaypointList.cc 4 additions, 1 deletion

src/ui/WaypointList.cc

with 42 additions and 5 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