Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 2 May 2011 05:23:24 +0000 (07:23 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 2 May 2011 05:23:24 +0000 (07:23 +0200)
commit280242a5a14a99cc10857e35da61ac5b894d5f6b
treefcb25e58ad391b288c55ec9298259bd5bf8f4e8b
parent3f872cd6899fe53ed2549f7d2d9b0c902721f667
parent155faa3b8b1e04241bd53df3eb008d54a71cc667
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2