diff options
author | aavit <qt-info@nokia.com> | 2010-04-23 13:41:22 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2010-04-23 13:41:22 (GMT) |
commit | 1d127826c96d0f60753cebc038fde2ced28e73d1 (patch) | |
tree | 4d4ef7d79d3877b4380f03729a889df5baabaf54 /src/multimedia/base/qmediaserviceprovider.cpp | |
parent | c1431e6daa5f0e229c2e79a945f28d00d70b0978 (diff) | |
parent | ffb5db8aafbe2b49be5cd454841a2af8acc426ee (diff) | |
download | Qt-1d127826c96d0f60753cebc038fde2ced28e73d1.zip Qt-1d127826c96d0f60753cebc038fde2ced28e73d1.tar.gz Qt-1d127826c96d0f60753cebc038fde2ced28e73d1.tar.bz2 |
Merge remote branch 'origin/4.7' into 4.7
Diffstat (limited to 'src/multimedia/base/qmediaserviceprovider.cpp')
0 files changed, 0 insertions, 0 deletions