Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 5 May 2011 01:29:03 +0000 (11:29 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Thu, 5 May 2011 01:29:03 +0000 (11:29 +1000)
commit5f46c8e70f8891cb8702bf4c5949d3595b193660
tree92106b292ace88089bf784ad55ee3d833a6c3ffb
parent3ea78d14ec04e7d39dd8848eef5ba4daf527d841
parentcff3c25ee616a7aee7bf1c0f983a190415668f5f
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2