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

7d8ebfd3

Commit 7d8ebfd3 authored 14 years ago by Lionel Heng

Downloads
- Plain Diff

Fixed merge for qgroundcontrol.pro

parents 4cb06414 0f18c7c5

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

images/earth.html 181 additions, 21 deletions

images/earth.html
lib/QMapControl/src/mapnetwork.cpp 3 additions, 1 deletion

lib/QMapControl/src/mapnetwork.cpp
models/ascent-park-glider.skp 0 additions, 0 deletions

models/ascent-park-glider.skp
models/multiplex-easyglider.skp 0 additions, 0 deletions

models/multiplex-easyglider.skp
models/multiplex-twinstar.skp 0 additions, 0 deletions

models/multiplex-twinstar.skp
models/walkera-4g6.skp 0 additions, 0 deletions

models/walkera-4g6.skp
qgroundcontrol.pri 4 additions, 0 deletions

qgroundcontrol.pri
qgroundcontrol.pro 7 additions, 3 deletions

qgroundcontrol.pro
src/uas/UAS.cc 1 addition, 0 deletions

src/uas/UAS.cc
src/uas/UAS.h 0 additions, 1 deletion

src/uas/UAS.h
src/ui/map3D/QGCGoogleEarthView.cc 86 additions, 2 deletions

src/ui/map3D/QGCGoogleEarthView.cc
src/ui/map3D/QGCGoogleEarthView.h 39 additions, 0 deletions

src/ui/map3D/QGCGoogleEarthView.h
src/ui/map3D/QGCGoogleEarthViewWin.ui 21 additions, 0 deletions

src/ui/map3D/QGCGoogleEarthViewWin.ui
src/ui/map3D/QGCWebPage.cc 12 additions, 0 deletions

src/ui/map3D/QGCWebPage.cc
src/ui/map3D/QGCWebPage.h 21 additions, 0 deletions

src/ui/map3D/QGCWebPage.h

with 375 additions and 28 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