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

9b1804a8

Commit 9b1804a8 authored 11 years ago by Bryant

Downloads
- Plain Diff

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

parents fdcb5567 8432278f

No related branches found

No related tags found

Loading

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

src/uas/UAS.cc 3 additions, 4 deletions

src/uas/UAS.cc
src/ui/DebugConsole.cc 19 additions, 4 deletions

src/ui/DebugConsole.cc
src/ui/DebugConsole.h 4 additions, 0 deletions

src/ui/DebugConsole.h
src/ui/HDDisplay.cc 4 additions, 2 deletions

src/ui/HDDisplay.cc
src/ui/HSIDisplay.cc 2 additions, 0 deletions

src/ui/HSIDisplay.cc
src/ui/MainWindow.cc 11 additions, 50 deletions

src/ui/MainWindow.cc
src/ui/MainWindow.ui 1 addition, 0 deletions

src/ui/MainWindow.ui
src/ui/QGCWaypointListMulti.cc 6 additions, 0 deletions

src/ui/QGCWaypointListMulti.cc
src/ui/uas/UASInfoWidget.cc 6 additions, 13 deletions

src/ui/uas/UASInfoWidget.cc
src/ui/uas/UASListWidget.cc 5 additions, 0 deletions

src/ui/uas/UASListWidget.cc

with 61 additions and 73 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