src/VideoStreaming · 6331f7bc32d909a475eae175ff0f62b663dd6f2c · Valentin Platzgummer / qgroundcontrol · GitLab

History Find file

Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into qgc4 · 7eb9fbc6
Gus Grubba authored May 14, 2019
```
# Conflicts:
#	qgroundcontrol.qrc
#	src/Microhard/MicrohardSettings.qml
#	src/VehicleSetup/FirmwareUpgrade.qml
```
7eb9fbc6

Name	Last commit	Last update
..
gstqtvideosink		Loading commit data...
iOS		Loading commit data...
CMakeLists.txt		Loading commit data...
README.md		Loading commit data...
VideoItem.cc		Loading commit data...
VideoItem.h		Loading commit data...
VideoReceiver.cc		Loading commit data...
VideoReceiver.h		Loading commit data...
VideoStreaming.cc		Loading commit data...
VideoStreaming.h		Loading commit data...
VideoStreaming.pri		Loading commit data...
VideoSurface.cc		Loading commit data...
VideoSurface.h		Loading commit data...
VideoSurface_p.h		Loading commit data...