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

5a9d5927

Commit 5a9d5927 authored 14 years ago by lm

Downloads
- Plain Diff

Merge branch 'master' of http://github.com/malife/qgroundcontrol

parents 7de71387 cb306047

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

qgroundcontrol.pri 9 additions, 5 deletions

qgroundcontrol.pri
qgroundcontrol.pro 7 additions, 3 deletions

qgroundcontrol.pro
src/comm/MAVLinkSimulationLink.cc 14 additions, 4 deletions

src/comm/MAVLinkSimulationLink.cc
src/main.cc 1 addition, 0 deletions

src/main.cc
src/uas/SlugsMAV.cc 95 additions, 1 deletion

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

src/uas/SlugsMAV.h
src/uas/UAS.cc 30 additions, 5 deletions

src/uas/UAS.cc

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