diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-09 11:15:36 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-09 11:15:37 +0200 |
commit | e1992d9d1db9e16161a4135d1a525482980c747d (patch) | |
tree | fabd86f120270d0027159907bc81d824915c9a21 /src/plugins/avfoundation | |
parent | bff19dbe6733d245adc2daf79fe3bab017abb1e2 (diff) | |
parent | 711efc552d65f22b262e049c5a046198377519dc (diff) |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: I0b4fde2a47b428fd04012a8dbec16fd14797b8dd
Diffstat (limited to 'src/plugins/avfoundation')
0 files changed, 0 insertions, 0 deletions