Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 10 Jan 2011 04:35:11 +0000 (14:35 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Mon, 10 Jan 2011 04:35:11 +0000 (14:35 +1000)
commit0aeabd6b1de29c0f47b4414bac8e39ad67b70928
tree02d06362d8c412b67dee50d5b6e5b05a01b73b40
parent279f701c7fd988a5dec4abca8e9da01dc629672b
parent470cbd7d05f0f770e8f6d390289bae2a38b819ce
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7