Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Wed, 18 May 2011 11:11:51 +0000 (21:11 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Wed, 18 May 2011 11:11:51 +0000 (21:11 +1000)
commit1edb32e75df1b52411907d0c35130dfb48018b83
tree5e2617b1eb21e5ef9e0058128903b0c2ebb3d802
parentb8338a188160651fec238edb4d7fd59417eefe6d
parent57d9b5d3ca685ceacc0537dc9d3afdfaa243a768
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2