Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Fri, 29 Apr 2011 07:14:55 +0000 (09:14 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Fri, 29 Apr 2011 07:14:55 +0000 (09:14 +0200)
commita7dbf8a92f18fb77cb74d46da58ddd36f02bcb1f
tree60bdaad752e380a590341a31c6d825c5e26f6930
parent425fe5978bd958cd3788ccb80562f6fabe0d8493
parentfc5028ffa6ac5720ed3c47787a92a761b0d270cf
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2