Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Oct 2010 01:49:54 +0000 (03:49 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Oct 2010 01:49:54 +0000 (03:49 +0200)
commite5ef6f580e1b601898a2fea095ed5be9823bab25
tree8730259b47d0158be6800010a1dba5ef3e429949
parent8f114382b0e0f03ced3559604da41a01b44ecc66
parentca53010303bca1b686fdd0488e0549c0a42a60a1
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:
  Demo Spectrum wav data size is not calculated correctly