Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 20 Jun 2011 07:47:47 +0000 (09:47 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 20 Jun 2011 07:47:47 +0000 (09:47 +0200)
commit87c1d65ee20fadd860969ca2529b24f658d613b8
tree242170b486af1e5ae637acd2d9cd7e0c9b70937a
parentde18164da6f5e22052fa77493ac5666e31fab2e7
parent0eeb925aa5039ffddf8d623f250980fc4c97712e
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2