summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudio.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-24 22:27:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-24 22:27:54 (GMT)
commit5dd9ac97fbe716699d832853bd61627a9f7885a8 (patch)
tree42d58f5edd5c2cd0e62a3cf054624bf1da2c742d /src/multimedia/audio/qaudio.h
parente5935fb92f89ab88daa0060465e665a626bfa88b (diff)
parent0a46cce85dc53b4adce195343a9bddadd070af0c (diff)
downloadQt-5dd9ac97fbe716699d832853bd61627a9f7885a8.zip
Qt-5dd9ac97fbe716699d832853bd61627a9f7885a8.tar.gz
Qt-5dd9ac97fbe716699d832853bd61627a9f7885a8.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compile error introduced by win32 surround sound support change. Added surround sound support to alsa low-level audio backend. Added surround sound support to win32 low-level audio backend.
Diffstat (limited to 'src/multimedia/audio/qaudio.h')
0 files changed, 0 insertions, 0 deletions