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

bb39af73

Commit bb39af73 authored 8 years ago by dogmaphobic

Downloads
- Plain Diff

Merge remote-tracking branch 'Mavlink/master' into preferencesPanel

* Mavlink/master:
  Log selection support fron Settings/Console
  Remove X to close since it conflicts with QGCViewDialogs

parents e2d9e4bc 4c3c6da4

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/QGCApplication.cc 2 additions, 66 deletions

src/QGCApplication.cc
src/QGCLoggingCategory.cc 66 additions, 0 deletions

src/QGCLoggingCategory.cc
src/QGCLoggingCategory.h 22 additions, 4 deletions

src/QGCLoggingCategory.h
src/QmlControls/AppMessages.qml 146 additions, 95 deletions

src/QmlControls/AppMessages.qml
src/QmlControls/QGroundControlQmlGlobal.h 13 additions, 0 deletions

src/QmlControls/QGroundControlQmlGlobal.h

with 249 additions and 165 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