diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-19 14:35:33 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-19 14:45:09 +0100 |
| commit | af2d5a181c3d48e04c2459d551f320cfd7186630 (patch) | |
| tree | d7187e0c81d0c300cf4e645eedccd359e27124c3 /src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | |
| parent | 9a215d954b00b6d07568392a1894341027c1af5a (diff) | |
| parent | 4ab105b89e13c746b08fb807e2104bfca05e88f1 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
src/plugins/gstreamer/camerabin/camerabinsession.cpp
Change-Id: I66a6f3efc5391013934b6b321073c31f25e1de26
Diffstat (limited to 'src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp')
0 files changed, 0 insertions, 0 deletions