summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-10 06:18:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-10 06:18:47 (GMT)
commitc6ac172d82d7a76f39c473f55e073a6b6e40a37e (patch)
tree36397a3c7d75a814327492e9450f546db016e643 /doc/src/snippets/code
parentbd90a38b851e47ccc922838a71a5631437e5b43c (diff)
parent0eb2aa1de730b0223bb0e2aa9cc53b6ee608b6bf (diff)
downloadQt-c6ac172d82d7a76f39c473f55e073a6b6e40a37e.zip
Qt-c6ac172d82d7a76f39c473f55e073a6b6e40a37e.tar.gz
Qt-c6ac172d82d7a76f39c473f55e073a6b6e40a37e.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 deadlock introduced by change Fixed invokeMethod in alsa implementation.
Diffstat (limited to 'doc/src/snippets/code')
0 files changed, 0 insertions, 0 deletions