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

6a937f1b

Commit 6a937f1b authored 13 years ago by lm

Downloads
- Plain Diff

Merge branch 'videostreaming' of https://github.com/fattonz/qgroundcontrol into dev-mac

parents aa5f67d4 22d043ae

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

images/patterns/lenna.jpg 0 additions, 0 deletions

images/patterns/lenna.jpg
mavground.qrc 1 addition, 0 deletions

mavground.qrc
qgcvideo.pro 9 additions, 6 deletions

qgcvideo.pro
src/apps/qgcvideo/QGCVideoApp.cc 3 additions, 1 deletion

src/apps/qgcvideo/QGCVideoApp.cc
src/apps/qgcvideo/QGCVideoMainWindow.cc 53 additions, 0 deletions

src/apps/qgcvideo/QGCVideoMainWindow.cc
src/apps/qgcvideo/QGCVideoMainWindow.h 7 additions, 0 deletions

src/apps/qgcvideo/QGCVideoMainWindow.h
src/apps/qgcvideo/QGCVideoWidget.cc 8 additions, 12 deletions

src/apps/qgcvideo/QGCVideoWidget.cc
src/apps/qgcvideo/QGCVideoWidget.h 1 addition, 0 deletions

src/apps/qgcvideo/QGCVideoWidget.h

with 82 additions and 19 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