summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-04 03:56:15 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-04 03:56:15 (GMT)
commit2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4 (patch)
tree55ebf8f3c738a516c089bffd71e5385b5c730fb7 /tools/qdoc3
parent46dbe721c8a9efc555eb4c449141071825f2f747 (diff)
parent1cc9c745f09c3399aeccc0f9b8ca07bbbfaf143b (diff)
downloadQt-2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4.zip
Qt-2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4.tar.gz
Qt-2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4.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 namespace qml decleration. Cocoa namespace fixes. Namespace fixes. QT7 mediaservice; Fix memory leak Undo a doc revert. Remove dependency on declarative from multimedia.
Diffstat (limited to 'tools/qdoc3')
0 files changed, 0 insertions, 0 deletions