Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Jan 2010 06:55:56 +0000 (07:55 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Jan 2010 06:55:56 +0000 (07:55 +0100)
commit48e08ee5718b3de855ecea626179ad5323e38fa0
treea0393670e7da7ce268b5581ef2c4750f2e5a4e07
parenta301ccba853e34147d1a6276a77d9fd26ac0f6a1
parent08c3b4b7c3c384829f7f86ec2d8e7f3499942284
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
  Fix example in QAudioOutput/QAudioInput docs
src/multimedia/audio/qaudioinput.cpp