Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Tue, 21 Jun 2011 05:31:40 +0000 (15:31 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Tue, 21 Jun 2011 05:31:40 +0000 (15:31 +1000)
commit576ba2e1c5b7867545ea25feff3354c61c485f8a
tree016e9cdbbd96f4d0dfa9b4d846127ab3f0bf42c9
parent222b1e0784b0cdfe2933235a62823c5342618f14
parent275384fcb5da79742cd427f5ab5ae881cd7bb56a
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2