summaryrefslogtreecommitdiffstats
path: root/demos/composition/composition.html
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-26 01:11:16 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-26 01:11:16 (GMT)
commitf2aa8bfcd3c5e94c72ad8da646a822fd032a4a11 (patch)
treeb9d3d678c0d65109e224ab218079c83fe56dbb3f /demos/composition/composition.html
parentef704ebad66559170d761459d42d6c99996db529 (diff)
parent83ca0eda314bcc3938d7cd716c640a1db5911c97 (diff)
downloadQt-f2aa8bfcd3c5e94c72ad8da646a822fd032a4a11.zip
Qt-f2aa8bfcd3c5e94c72ad8da646a822fd032a4a11.tar.gz
Qt-f2aa8bfcd3c5e94c72ad8da646a822fd032a4a11.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF backend: removed redundant trace output qmediaplayer: added command-line switch for initial volume
Diffstat (limited to 'demos/composition/composition.html')
0 files changed, 0 insertions, 0 deletions