Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorMartin Jones <martin.jones@nokia.com>
Mon, 30 May 2011 01:42:04 +0000 (11:42 +1000)
committerMartin Jones <martin.jones@nokia.com>
Mon, 30 May 2011 01:42:04 +0000 (11:42 +1000)
commita639e6a95c7f8a59cb19fc8eb5f32cf8f2493863
tree54cf764b928d636d65725f7c7275c8ba528c7499
parent0063c93d1ca1cc69b890e6263b95f18a7667b6ff
parent985787e85dd9d00cb7a5d1e412383b9883f2fe7f
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2