diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 04:08:32 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-07 04:08:32 (GMT) |
commit | 844b80fbd808a3f41bd2b6f49cf2a1419f95b8d4 (patch) | |
tree | afc6e777ccc36bff3fa63a923d0e315b541bcb8b /doc/src/snippets/declarative/integrating-javascript/includejs | |
parent | ae1e2319bccfc57cc47614ece39e64b80e5f2380 (diff) | |
parent | 1750a383ad0ca90c36f853d7b4ee73ff4de6801f (diff) | |
download | Qt-844b80fbd808a3f41bd2b6f49cf2a1419f95b8d4.zip Qt-844b80fbd808a3f41bd2b6f49cf2a1419f95b8d4.tar.gz Qt-844b80fbd808a3f41bd2b6f49cf2a1419f95b8d4.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