summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-22 05:13:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-22 05:13:14 (GMT)
commit69b1784edb6dd82f26100d0e539bfa8a65bdd35d (patch)
tree6d7d6804e59aa6e46d2bde6d98e7fd06bdf1800a /src/corelib
parent155ae1da9dcf11617f412e5c229a2a12a333d7db (diff)
parent129b6b9b5c6502058c7701367119bfe6607fbff5 (diff)
downloadQt-69b1784edb6dd82f26100d0e539bfa8a65bdd35d.zip
Qt-69b1784edb6dd82f26100d0e539bfa8a65bdd35d.tar.gz
Qt-69b1784edb6dd82f26100d0e539bfa8a65bdd35d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Documentation fixes. Add a qRegisterQmlElements function to QtMultimedia
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions