Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 09:04:33 +0000 (19:04 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 09:04:33 +0000 (19:04 +1000)
commit5efc078be14f75a4abbeadd237450967da0493ae
tree628049ae6758bf8ace03f0d6a3ba6f2492d2267f
parent136e9af2a09fa65f3742cccab65daeccea7e5183
parent3fa63d73330bd74a563e33dbd56b4c04d16f470d
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2