diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 17:49:54 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 17:49:54 +0200 |
| commit | 9267a7833c6c30ccd4cbda3d087f0f901fb462eb (patch) | |
| tree | d3ce3857dbd51259eb5dbf90bbb0c58917add15f /src/plugins/avfoundation/camera/avfcamerasession.mm | |
| parent | 5b3292a14e0c860fc99e0795bb30cc161e934e41 (diff) | |
| parent | 80ba1d635dc37963b4c90d776c46774b0349c4f8 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ib2ef516ab5f5dab86b73fdca5503048e87840280
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerasession.mm')
0 files changed, 0 insertions, 0 deletions