Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 16 May 2011 03:23:22 +0000 (13:23 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Mon, 16 May 2011 03:23:22 +0000 (13:23 +1000)
commit12a43977ffb2c023413417966d47616ad9a9aa78
tree465c257dcb20518920d6762d2abc9986359c1d0a
parent2081a3d0fd7266ffba83849fee967e048e991270
parentc05668a43696dfde91c81184669d44d55a8f21f5
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2