summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-16 13:31:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-16 13:31:12 (GMT)
commit585c2c22962cbb1fbca176fd8a5589e3343b87a7 (patch)
tree439e742e0c4740faa986b9769a85988b9dc8fecd /src/multimedia
parent83e321747920c31d6fa4c860de3683630fbedb5d (diff)
parentc640e500ed34e9267c654e52fcc1f7a15b9b30e9 (diff)
downloadQt-585c2c22962cbb1fbca176fd8a5589e3343b87a7.zip
Qt-585c2c22962cbb1fbca176fd8a5589e3343b87a7.tar.gz
Qt-585c2c22962cbb1fbca176fd8a5589e3343b87a7.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Fix no-headers and HTTP-100 handling
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions