diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:11:35 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:11:35 +0100 |
| commit | c6ec402d257dfc49a98d2f88989b6dfee7bc4e8a (patch) | |
| tree | 92a278d08342bb85e2fe18d2ea78d66530984aca /src/plugins/avfoundation/camera/avfcamerasession.mm | |
| parent | 7a02bcaad18d7aa133944a23f863c2f9efcbf5fe (diff) | |
| parent | db7f7cc5654ddec60297259bc9f86f5f777749cd (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie93615076177662e75d46f3d13beeb88d424b4a6
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcamerasession.mm')
0 files changed, 0 insertions, 0 deletions