diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-22 11:36:50 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-22 11:36:50 +0100 |
commit | 819f30df336ec58ec487f19919ade198d016826d (patch) | |
tree | 8e64156c1280ce42f2f45f8557354207a7acee00 /src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm | |
parent | 60fb11d9a2f5ff659a6ccffe01b4de16c1fb5929 (diff) | |
parent | a0746fe49c186566fc8c619daf0b8bb82929ac55 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ifcb0e0bac29c11980ea2a9d67b12e1b79c4bd9f6
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm')
0 files changed, 0 insertions, 0 deletions