diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-23 12:22:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-23 12:22:50 +0100 |
| commit | 2f494446388e314286506eae335439b7bbc75736 (patch) | |
| tree | 5b8e9ee8f8bb5ead36329017f0631489f70ea437 /src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | |
| parent | d07a22c8848fa2bf0088c961785c799cea49a833 (diff) | |
| parent | af2d5a181c3d48e04c2459d551f320cfd7186630 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp')
0 files changed, 0 insertions, 0 deletions