| commit | 2f91e9ce0e02f613d68b5b59d00b61c8f4f12c68 | |
| author | Qt Continuous Integration System <qt-info@nokia.com> | |
| Thu, 28 Jan 2010 23:56:23 +0000 (29 00:56 +0100) | ||
| committer | Qt Continuous Integration System <qt-info@nokia.com> | |
| Thu, 28 Jan 2010 23:56:23 +0000 (29 00:56 +0100) | ||
| tree | 5865f51c56da2090f9a2698e76a7ce348698b093 | treesnapshot (tar.gz zip) |
| parent | 028b4b56fdbc74c89e27feecf047fb5e92752560 | commitdiff |
| parent | a3803f5a950a7e3ad25af40bdae140ea59651001 | commitdiff |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
Added new funcs to QAudioFormat and QAudioDeviceInfo class's.
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
Added new funcs to QAudioFormat and QAudioDeviceInfo class's.