diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-16 03:00:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-16 03:00:47 +0100 |
| commit | 4077428310aefb64b8030ea0da00343afc986e1a (patch) | |
| tree | d5bb59a63a5862559af7f54bd348a08dc193be7b /src/plugins/avfoundation/camera/avfmediaassetwriter.h | |
| parent | 7dc8468682e88dd218a6a7c424d666c3c834227c (diff) | |
| parent | 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I947a3b4aaf39e56b9505ae802b8b31c718922639
Diffstat (limited to 'src/plugins/avfoundation/camera/avfmediaassetwriter.h')
0 files changed, 0 insertions, 0 deletions