Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorBea Lam <bea.lam@nokia.com>
Mon, 1 Mar 2010 05:05:24 +0000 (15:05 +1000)
committerBea Lam <bea.lam@nokia.com>
Mon, 1 Mar 2010 05:05:24 +0000 (15:05 +1000)
commite8b2404e04ff38511a96ae2dfb2aa097c6ec8166
tree91f59051e690551cb89df3d0304bb714c711b2f0
parent8095b3074a47ff317cafdce5e8a8f955bf8c97fa
parent20def6f5fe3e02bda1c5f5873ed1923d36511312
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

Conflicts:
tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp