summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-03 07:37:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-03 07:37:06 (GMT)
commite384ef218722d9380988fbe3b1bd30848ceb2c5c (patch)
tree25585bf99d1fc0887149a7c617ab1faaedf6e1b3 /src/multimedia
parentfbf487762979846452e348b711f27a67c4edbc49 (diff)
parentf7b64c3f9bb76bc8dbd96852e54e698af68331cb (diff)
downloadQt-e384ef218722d9380988fbe3b1bd30848ceb2c5c.zip
Qt-e384ef218722d9380988fbe3b1bd30848ceb2c5c.tar.gz
Qt-e384ef218722d9380988fbe3b1bd30848ceb2c5c.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QSound OSX; Fix memory leak.
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions