Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 30 May 2011 02:11:53 +0000 (12:11 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Mon, 30 May 2011 02:11:53 +0000 (12:11 +1000)
commitb98c9a81e833395b4b568a556ff077c067197902
tree162bae18f41452c8afbf8f713ac88d7baf12b018
parentf982df80109666c19541b235e34c712b33cfbcc4
parenta639e6a95c7f8a59cb19fc8eb5f32cf8f2493863
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2