projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cb34d11 22b2a33)
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 25 Nov 2010 00:08:18 +0000 (01:08 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 25 Nov 2010 00:08:18 +0000 (01:08 +0100)
commit4e473519cfe6a55e6c5d233629d7552ab861f1ae
tree9a1e0152746ddb48798c2c3388b151ee16fb5b86tree | snapshot
parentcb34d11e4c98e768432e00c867b3321d3b89dd9dcommit | diff
parent22b2a33aba2660e433de473cdadb540a33d8a6aacommit | diff
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fix compliation of ALSA audio backend when checking for surround support.
6b46b7419a5aee9bd5fce67b7bfa8afe8e