Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Tue, 21 Jun 2011 02:03:07 +0000 (12:03 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Tue, 21 Jun 2011 02:03:07 +0000 (12:03 +1000)
commit222b1e0784b0cdfe2933235a62823c5342618f14
tree4a6679327b176150f2b4be64535dc5a5b4ec3c28
parentf0ab52c313076fce7e854fd494b88c5dd0f71af5
parent0990f073953a499b1413b049c1909d09fec5a815
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
src/declarative/particles/qsgpointattractor.cpp