Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Wed, 15 Jun 2011 08:55:41 +0000 (18:55 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Wed, 15 Jun 2011 08:55:41 +0000 (18:55 +1000)
commit4c6e4cbe7d8a4d3e7d4cab8fb9787f4c781bed50
tree02e454a5ea4c13ee98ff8dbb2ba541f0d6dac8d3
parentfab0da3853efc5ef2f1a507f7d054b8a0dd3b9ac
parent4c0f5e2da92e861228abc89e4b9b116803a761ce
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2