Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 23 May 2011 14:04:21 +0000 (16:04 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 23 May 2011 14:04:21 +0000 (16:04 +0200)
commit780097f270c40814691459396661ebed90285ab8
tree0bb09ba85d2e4d594cb8f8995029abdad70720ed
parentf0819b0c3f80fb4f6abad8f00ef94cf52dd6c123
parent7aa14bb332a737490698f2d2381877980cdc25ee
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2