diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-11 10:01:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-11 10:01:29 +0200 |
| commit | 66613b4f9cada951b1f25c5d0f77bee88824c710 (patch) | |
| tree | 3735e47019e9bde30a5197c5f7d6a39757a00f68 /src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp | |
| parent | 176d52bb28b425f697ad8df001ba2c7c52fda766 (diff) | |
| parent | 0761f2d53f6e6d2b482326442100693542142a52 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I0390795fa3d5f2a7ba098b514ee2da4a86e243a6
Diffstat (limited to 'src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp')
0 files changed, 0 insertions, 0 deletions