diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-08 06:05:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-08 06:05:47 (GMT) |
| commit | 86228b5f48292dfdbb5ae0b39f20452f3741918f (patch) | |
| tree | 3da263d6ff809c64bd272736536e439188e96592 /doc/src/snippets/declarative/integrating-javascript/includejs/script.js | |
| parent | a27ba245a704f0e18c6dceb4f1af4ee941599e3b (diff) | |
| parent | 5a33313a7730a2e799f6dadb6b1221ae0da3f4f1 (diff) | |
| download | Qt-86228b5f48292dfdbb5ae0b39f20452f3741918f.zip Qt-86228b5f48292dfdbb5ae0b39f20452f3741918f.tar.gz Qt-86228b5f48292dfdbb5ae0b39f20452f3741918f.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:
Revert "QScroller merge, part 2"
Revert "Fix code style issues in QScroller based Flickable replacement."
Revert "Fix qreal vs. double issue and a copy/paste error."
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/script.js')
0 files changed, 0 insertions, 0 deletions