summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-24 13:12:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-24 13:12:51 (GMT)
commite15d5fc7e1a82da38b765e55d040edbdf8621ae2 (patch)
treeedf4191a346bcdae338dbad555873a23fb872341 /src/plugins/mediaservices
parent4e35b06fc52bf054ef3f23609fe698c6eb915dc9 (diff)
parent38db6eba54534207126915f6f195c8af9f772833 (diff)
downloadQt-e15d5fc7e1a82da38b765e55d040edbdf8621ae2.zip
Qt-e15d5fc7e1a82da38b765e55d040edbdf8621ae2.tar.gz
Qt-e15d5fc7e1a82da38b765e55d040edbdf8621ae2.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Help qt-qml integrate.
Diffstat (limited to 'src/plugins/mediaservices')
0 files changed, 0 insertions, 0 deletions