Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Tue, 14 Jun 2011 01:45:20 +0000 (11:45 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Tue, 14 Jun 2011 01:45:20 +0000 (11:45 +1000)
commitba7e87ffe0f1cb356dc31dc2d43640d06309eaa7
tree24a88f3d9cb26edf4e8f8fec720f6851bd5b0502
parent7b28a7eebeb8cbe5d356fc9b24651a36d73ab1ad
parente86bdcd3ce686eb14bb70e0b18b227f713a902b6
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2