diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 13:24:34 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 13:24:34 (GMT) |
commit | f6835920b5497f228e2aa3ba397437af30a0bfe9 (patch) | |
tree | bd55bc7c13302c8e91691e65caf95081c92e5151 /doc | |
parent | 72c8900e421ab4afd65b3752551a7fb857ca540f (diff) | |
parent | 66da996c11d2f630255650e6e88fc1a08a393b27 (diff) | |
download | Qt-f6835920b5497f228e2aa3ba397437af30a0bfe9.zip Qt-f6835920b5497f228e2aa3ba397437af30a0bfe9.tar.gz Qt-f6835920b5497f228e2aa3ba397437af30a0bfe9.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:
Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions