diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-19 13:25:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-19 13:39:16 +0200 |
| commit | 66c0334a3c4cb8deb63c67aa70da3f4ed94f89a4 (patch) | |
| tree | caf62f9e6a8486862216306f62bf1ff4627df9f7 /src/imports/multimedia/multimedia.cpp | |
| parent | acc49e582abf76c962851f53cbd66134812f6a1f (diff) | |
| parent | 6b5b4d4ab4806812eaa4f6ddc78831ad31d0e7d9 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h
Change-Id: Ic6e27742ef6d1af0532ad05902a1431ebd5f449d
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
0 files changed, 0 insertions, 0 deletions