Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 03:08:02 +0000 (13:08 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 03:08:02 +0000 (13:08 +1000)
commit2c5df92e860f8fba494b62ce6ee619766f004490
tree44f12150baa11c88c2c2c0822307e5726f311ff2
parent2e0b25c49bf0e0a485360654ce6d51d38607c97b
parent5695c61b11618b163a326afaa2f1b0bb4854339c
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2