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

988e99fe

Commit 988e99fe authored 13 years ago by pixhawk

Downloads
- Plain Diff

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

parents 577258d5 6a38548a

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

deploy/qgroundcontrol_installer.nsi 1 addition, 1 deletion

deploy/qgroundcontrol_installer.nsi
qgroundcontrol.pri 6 additions, 0 deletions

qgroundcontrol.pri
src/QGC.h 16 additions, 3 deletions

src/QGC.h
src/comm/MAVLinkSimulationWaypointPlanner.cc 3 additions, 3 deletions

src/comm/MAVLinkSimulationWaypointPlanner.cc
src/libs/opmapcontrol/src/mapwidget/uavitem.cpp 1 addition, 1 deletion

src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
src/uas/QGCUASParamManager.cc 1 addition, 1 deletion

src/uas/QGCUASParamManager.cc
src/ui/HUD.cc 0 additions, 14 deletions

src/ui/HUD.cc
src/ui/QGCDataPlot2D.cc 45 additions, 6 deletions

src/ui/QGCDataPlot2D.cc
src/ui/QGCDataPlot2D.ui 4 additions, 4 deletions

src/ui/QGCDataPlot2D.ui
src/ui/map/QGCMapTool.cc 2 additions, 0 deletions

src/ui/map/QGCMapTool.cc
src/ui/map/QGCMapTool.h 1 addition, 0 deletions

src/ui/map/QGCMapTool.h
src/ui/map/QGCMapToolBar.cc 33 additions, 0 deletions

src/ui/map/QGCMapToolBar.cc
src/ui/map/QGCMapToolBar.h 5 additions, 0 deletions

src/ui/map/QGCMapToolBar.h
src/ui/map/QGCMapToolBar.ui 7 additions, 0 deletions

src/ui/map/QGCMapToolBar.ui
src/ui/map/QGCMapWidget.cc 18 additions, 17 deletions

src/ui/map/QGCMapWidget.cc

with 143 additions and 50 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