Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 15 Jun 2011 13:47:32 +0000 (15:47 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 15 Jun 2011 13:47:32 +0000 (15:47 +0200)
commitd1bb9e36d0c3497b790fdf1887dcef0567aaad46
tree315822554f8df462cc47bb2a3a386844799ae327
parentca31cbf2ad5dc43d74a2220d929f45bfe10c806b
parentb0183beea565baca7f32f4f2f4aa579ae6901577
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
src/declarative/items/qsgshadereffectmesh.cpp