Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 9 Jun 2011 09:01:51 +0000 (19:01 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Thu, 9 Jun 2011 09:01:51 +0000 (19:01 +1000)
commit6e69712287fa2d6087e5423cc4b7aace8b790894
tree39198066f55146e3ab4730f292b2130da79f182f
parenta22053ad9ee145bb312beaa673c9d1efa9ccf2a3
parent73081387d84c4b77dafeda927d1fc1ebee6cfdf2
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2