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

9dcfa761

Commit 9dcfa761 authored 7 years ago by Gus Grubba

Downloads
- Plain Diff

Merge branch 'DNSLookup' of https://github.com/mavlink/qgroundcontrol into cameraControl

parents 9e04bc16 09fcec33

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

QGCSetup.pri 2 additions, 0 deletions

QGCSetup.pri
src/FactSystem/FactControls/FactTextField.qml 1 addition, 1 deletion

src/FactSystem/FactControls/FactTextField.qml
src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml 2 additions, 1 deletion

src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
src/QmlControls/AppMessages.cc 2 additions, 2 deletions

src/QmlControls/AppMessages.cc
src/QmlControls/AppMessages.h 1 addition, 1 deletion

src/QmlControls/AppMessages.h
src/QmlControls/AppMessages.qml 1 addition, 1 deletion

src/QmlControls/AppMessages.qml
src/QmlControls/ParameterEditorDialog.qml 17 additions, 4 deletions

src/QmlControls/ParameterEditorDialog.qml
src/QtLocationPlugin/QGCTileCacheWorker.cpp 22 additions, 6 deletions

src/QtLocationPlugin/QGCTileCacheWorker.cpp
src/QtLocationPlugin/QGCTileCacheWorker.h 5 additions, 0 deletions

src/QtLocationPlugin/QGCTileCacheWorker.h
src/QtLocationPlugin/QMLControl/OfflineMap.qml 7 additions, 5 deletions

src/QtLocationPlugin/QMLControl/OfflineMap.qml

with 60 additions and 21 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