Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 2 Dec 2011 03:55:04 +0000 (13:55 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 2 Dec 2011 03:55:04 +0000 (13:55 +1000)
commit46db88be9fb0b8951916d706c39e1079f38f277d
tree90b3556dde3099eaa18e8d911b3f34af71738cab
parent65378628d1772204d8254d7ec009c94b0ef2da85
parent62f9eeb0fd4ef79a6b92d4b5263122d5d3d56c09
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Fix QtDemo declarative examples
  Correct image paths for dynamicscene