Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Wed, 8 Jun 2011 08:03:53 +0000 (18:03 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Wed, 8 Jun 2011 08:03:53 +0000 (18:03 +1000)
commit124b71128feb596b136a545eb128c3b0e7093bf7
tree6f57f9723c98d085ad5c949cae2a63babd335aaf
parentc8a5c00ec1c06f7c00070d55cd61cb8d52dc67cf
parente2d979243c398a46ee9c3b1f36c647884952b6c7
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2