summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-16 06:29:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-16 06:29:51 (GMT)
commit9c9215201c3213b0c6532245ea430452e603bf88 (patch)
tree99a14dc5efc6662c9372100c664fb7780f78a3be /dist
parent4a4c955a15fd0bd88bee6814f119733df3cb227b (diff)
parenteb9d15004926848a21d46c4efbcc3882746b7f49 (diff)
downloadQt-9c9215201c3213b0c6532245ea430452e603bf88.zip
Qt-9c9215201c3213b0c6532245ea430452e603bf88.tar.gz
Qt-9c9215201c3213b0c6532245ea430452e603bf88.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: VideoWidget example
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions