summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-25 02:49:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-25 02:49:42 (GMT)
commit1323737d3901936853075de8206a88154b858d85 (patch)
treeae884b180c7261ed972d89f758d285551d0d705e /src/3rdparty
parente5935fb92f89ab88daa0060465e665a626bfa88b (diff)
parent0ad9edf26daf78d697cd9e83c639c65879461b0f (diff)
downloadQt-1323737d3901936853075de8206a88154b858d85.zip
Qt-1323737d3901936853075de8206a88154b858d85.tar.gz
Qt-1323737d3901936853075de8206a88154b858d85.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: Fix compile error on win32 with multimedia lib. Fix compile err with win2005 compiler for multimedia lib. Fixed compile error in multimedia module 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/3rdparty')
0 files changed, 0 insertions, 0 deletions