diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 19:16:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 19:16:25 (GMT) |
| commit | 5a33313a7730a2e799f6dadb6b1221ae0da3f4f1 (patch) | |
| tree | 45e278e9add8f4bef667eb386d718d0be5f666bd /doc/src/snippets/declarative/integrating-javascript/includejs/script.js | |
| parent | 71f8955e0a2744bccff94495c4db5e054db8ab95 (diff) | |
| parent | 38389903bedbb45b640231c8a53e824ff3f99253 (diff) | |
| download | Qt-5a33313a7730a2e799f6dadb6b1221ae0da3f4f1.zip Qt-5a33313a7730a2e799f6dadb6b1221ae0da3f4f1.tar.gz Qt-5a33313a7730a2e799f6dadb6b1221ae0da3f4f1.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