summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-25 05:17:49 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-25 05:17:49 (GMT)
commit194013d9db1b3e4ba6f56a864f3b64f523202948 (patch)
tree7088302db57651f87e61bfac027d9f792e18eadb /src/plugins/mediaservices
parent020249df9d920e1bf783dd802f66761c4b7e123c (diff)
parent444e8812eec42abd2dcc5e47826f9a4793a34f66 (diff)
downloadQt-194013d9db1b3e4ba6f56a864f3b64f523202948.zip
Qt-194013d9db1b3e4ba6f56a864f3b64f523202948.tar.gz
Qt-194013d9db1b3e4ba6f56a864f3b64f523202948.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rename loopCount to loops, in line with other declarative elements.
Diffstat (limited to 'src/plugins/mediaservices')
0 files changed, 0 insertions, 0 deletions