summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-21 16:20:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-21 16:20:27 (GMT)
commit0113820e977044b12ee53d773bb6b00e76dd8eff (patch)
treec0c2bd41d56417af5ded4f0186aae80259ccd1fc /src/multimedia
parent643fc530a4f2531908fe8e668b020203a9c9ed72 (diff)
parent222d5c3e905a324f5508a0eb16114c5b3274af53 (diff)
downloadQt-0113820e977044b12ee53d773bb6b00e76dd8eff.zip
Qt-0113820e977044b12ee53d773bb6b00e76dd8eff.tar.gz
Qt-0113820e977044b12ee53d773bb6b00e76dd8eff.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: code style changes applied to MR 697 QElapsedTimer/Win: use QueryPerformanceCounter if available
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions