Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging
authorAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 24 Jun 2011 06:37:03 +0000 (16:37 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 24 Jun 2011 06:37:03 +0000 (16:37 +1000)
commit2a18f33552d20b637989e876175c6bd03c69bc97
tree1bfe921c52dcebeaadf79511168db7d8164ee062
parent09b01b54f23fb10fd6b63398edf813a2bbd04cff
parenta9853d2ffe177bf98eb7610b58bb1bbb44743510
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging

Conflicts:
src/declarative/items/qsgtextnode.cpp
src/declarative/items/qsgitem.cpp
src/declarative/items/qsgtextnode.cpp