diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-06 13:45:08 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-06 13:45:08 (GMT) |
commit | 1750a383ad0ca90c36f853d7b4ee73ff4de6801f (patch) | |
tree | d20b86a32c95a6b9e4e47e24b6c12818bdc42383 /doc/src/snippets/declarative/integrating-javascript/includejs | |
parent | a70ccc4aaad74dbf28569c78479d4668781bb0fe (diff) | |
parent | 236d4e3c5d58e69a85a362c702d830227309404d (diff) | |
download | Qt-1750a383ad0ca90c36f853d7b4ee73ff4de6801f.zip Qt-1750a383ad0ca90c36f853d7b4ee73ff4de6801f.tar.gz Qt-1750a383ad0ca90c36f853d7b4ee73ff4de6801f.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:
Fix qreal vs. double issue and a copy/paste error.
Fix code style issues in QScroller based Flickable replacement.
QScroller merge, part 2
Diffstat (limited to 'doc/src/snippets/declarative/integrating-javascript/includejs')
0 files changed, 0 insertions, 0 deletions