summaryrefslogtreecommitdiffstats
path: root/src/tools/bootstrap/bootstrap.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-24 06:06:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-24 06:06:59 (GMT)
commit2fccc31367b207cff68de063d9f3d55a993cde42 (patch)
treeb2cbe561e9059e6e9959d857ff0ccf884cee6c69 /src/tools/bootstrap/bootstrap.pro
parente3999a4f91194b7508dbd1d3e6f595f729022ed7 (diff)
parentba2daf7d948f740cd9ada2a26249ebbf76f5ca12 (diff)
downloadQt-2fccc31367b207cff68de063d9f3d55a993cde42.zip
Qt-2fccc31367b207cff68de063d9f3d55a993cde42.tar.gz
Qt-2fccc31367b207cff68de063d9f3d55a993cde42.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: Added extra video buffer handle types. QuickTime MovieViewOutput: remove view from layout and reset source
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pro')
0 files changed, 0 insertions, 0 deletions