Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 9 May 2011 08:36:33 +0000 (10:36 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 9 May 2011 08:36:33 +0000 (10:36 +0200)
commit5079bcd11e81a268603b2645b417e6e58c1cc0a3
treea25e0e9643c5eb430b8995b92b9dd0a403c1f678
parent66243440db487119b11d03dfb8be78c7481964b5
parent7c31b7a96944409573dc85a8a1709e799f4aa446
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2