diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-15 05:35:55 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-15 05:35:55 (GMT) |
| commit | d2fa5b80d4f40ac67a7a74552390332551563466 (patch) | |
| tree | 1ef112b385dbbdd49abefd9b574573f7d21b69bf /src/plugins/plugins.pro | |
| parent | f0d24ba1eaa1079abef3a1da641b43437dc7df66 (diff) | |
| parent | 6c5c2312ca5477a1ec33f43c1673ab65a0dce8bb (diff) | |
| download | Qt-d2fa5b80d4f40ac67a7a74552390332551563466.zip Qt-d2fa5b80d4f40ac67a7a74552390332551563466.tar.gz Qt-d2fa5b80d4f40ac67a7a74552390332551563466.tar.bz2 | |
Merge branch 'master' of ../../qt/master
Conflicts:
examples/multimedia/audioinput/audioinput.cpp
src/multimedia/audio/qaudiodeviceinfo.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.cpp
src/multimedia/audio/qaudioinput_win32_p.cpp
src/multimedia/audio/qaudiooutput_win32_p.cpp
tests/auto/qaudioformat/tst_qaudioformat.cpp
Diffstat (limited to 'src/plugins/plugins.pro')
0 files changed, 0 insertions, 0 deletions