| commit | 566d525f5139955f1af61b21d16644e349b9fc7a | |
| author | Justin McPherson <justin.mcpherson@nokia.com> | |
| Thu, 28 Jan 2010 02:26:30 +0000 (28 12:26 +1000) | ||
| committer | Justin McPherson <justin.mcpherson@nokia.com> | |
| Thu, 28 Jan 2010 02:26:30 +0000 (28 12:26 +1000) | ||
| tree | cc7376b1640726b1817e5f1b9d2b3936282f3914 | treesnapshot (tar.gz zip) |
| parent | d2fa5b80d4f40ac67a7a74552390332551563466 | commitdiff |
| parent | c9691c62b62c656a9a153b8879f13a5ce71a6d2d | commitdiff |
Merge branch 'master' of ../../qt/master
Conflicts:
src/multimedia/audio/qaudiodeviceinfo.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.cpp
Conflicts:
src/multimedia/audio/qaudiodeviceinfo.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.cpp