summaryrefslogtreecommitdiffstats
path: root/demos/qmediaplayer
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-12 06:28:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-12 06:28:47 (GMT)
commit6f736694461edc25b6e757f40ab9cad6a9207ad4 (patch)
treebd89c12b8042edfc3d241567d40783412e969de0 /demos/qmediaplayer
parent27f8facfea87d7c4669852e7aa0fe5d9ca828eb3 (diff)
parente6e4dbbf82fca646d95c86b5c4f9132378286198 (diff)
downloadQt-6f736694461edc25b6e757f40ab9cad6a9207ad4.zip
Qt-6f736694461edc25b6e757f40ab9cad6a9207ad4.tar.gz
Qt-6f736694461edc25b6e757f40ab9cad6a9207ad4.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: Add meta-data keys for embedded images.
Diffstat (limited to 'demos/qmediaplayer')
0 files changed, 0 insertions, 0 deletions