Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 05:17:20 +0000 (15:17 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 05:17:20 +0000 (15:17 +1000)
commit2c365f5a4733f211e341f09e72538183be69f962
tree2bc7fb3ff96c7414dcffeffbfca8a7befcd602a5
parent52d1ff7d3f302d3f4fc84085e4c4c9bd31c4e359
parentb8bc919e4ae9cccb056eccceecbb535c47985aa3
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2