Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 07:03:51 +0000 (17:03 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 07:03:51 +0000 (17:03 +1000)
commit6e6bdedd06c72f857590b32462548448da6d59b5
tree02d06362d8c412b67dee50d5b6e5b05a01b73b40
parent470cbd7d05f0f770e8f6d390289bae2a38b819ce
parent0aeabd6b1de29c0f47b4414bac8e39ad67b70928
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Update pathview test