summaryrefslogtreecommitdiffstats
path: root/doc/src/classes
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-14 03:55:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-14 03:55:22 (GMT)
commitecd0b1744442cba83d9bcad899f7b09cb99f2d92 (patch)
treea20785cafd67c7624f967a6eea3eabb3f4f5400c /doc/src/classes
parent862d5433fb694a03715b2327a107b3192b921924 (diff)
parent5a91631ed3ac6a0d792d0445290a01f3e0f5d7d3 (diff)
downloadQt-ecd0b1744442cba83d9bcad899f7b09cb99f2d92.zip
Qt-ecd0b1744442cba83d9bcad899f7b09cb99f2d92.tar.gz
Qt-ecd0b1744442cba83d9bcad899f7b09cb99f2d92.tar.bz2
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: Revert "Frequency to SampleRate and channels to channelCount." missed Revert "Frequency to SampleRate and channels to channelCount." Revert "Added setChannelCount() to QAudioFormat."
Diffstat (limited to 'doc/src/classes')
0 files changed, 0 insertions, 0 deletions