diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-09-26 15:28:44 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-09-26 15:28:44 +0200 |
| commit | 41a1c1634086b90d57b5736a0274452af5855a7e (patch) | |
| tree | 1d61e7605e4e7757ca1543d46d649f022d545c5a /src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp | |
| parent | 5c3a5cf8106e1b873924b296c792448c33ee4df1 (diff) | |
| parent | e195b7fc05d62cce626693a8d791e58466dd3ac7 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0
Diffstat (limited to 'src/plugins/qnx/mediaplayer/mmrenderervideowindowcontrol.cpp')
0 files changed, 0 insertions, 0 deletions