Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
authorDavid Boddie <dboddie@trolltech.com>
Thu, 7 Jan 2010 14:45:56 +0000 (15:45 +0100)
committerDavid Boddie <dboddie@trolltech.com>
Thu, 7 Jan 2010 14:45:56 +0000 (15:45 +0100)
commitce5f772c529517c3e1c043fd826a790316ed9915
tree159d306fedb648d659ecd6bc90c93225d1d2e6e1
parenta628b5579a977594cf125110589c8bd5096db380
parent55c983e33d974d046d8deab8b68b85efdb9eb03a
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
doc/src/deployment/deployment.qdoc
doc/src/snippets/audio/main.cpp
examples/multimedia/audioinput/audioinput.cpp
examples/multimedia/audioinput/audioinput.h
examples/multimedia/audiooutput/audiooutput.cpp
src/multimedia/audio/qaudioformat.cpp