Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 1 Mar 2010 03:04:57 +0000 (04:04 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 1 Mar 2010 03:04:57 +0000 (04:04 +0100)
commit6174f91cc2a8a53c14d3b2f4eccc62f9170699c8
tree08894dba6347764083f4fa9d73baed9486e2a986
parent1dca379031381eb7bff91970aec8056f1b7f2efb
parent47201b118179d6585d8eac8ab27f756010024a23
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
  Add mention of highlightRangeMode in snapMode docs.
  Fix position of image in detail view.