Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 16 Jun 2011 04:08:29 +0000 (14:08 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Thu, 16 Jun 2011 04:08:29 +0000 (14:08 +1000)
commit7126b27f5dfeba005cc7f17610bcc09cf0003b52
tree274a976b05f14463bb6b073cfe3e2d422f4665a9
parent4c6e4cbe7d8a4d3e7d4cab8fb9787f4c781bed50
parentb0183beea565baca7f32f4f2f4aa579ae6901577
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2