Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 27 May 2011 15:04:00 +0000 (01:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 27 May 2011 15:04:00 +0000 (01:04 +1000)
commita91b8a041966f8aea4bf01fdcb1d5006547f3902
treef548a09d815e75f8396b9bccd347f137fb32ab8c
parent0c57f330d1bfedb7253d639fc77c2daf864db091
parent5819e7edf72b0e69822d9bf7918b7ccad195a307
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  QmlDebugger: removing slots in Live Preview
  QmlDebugger: adding slots to items in Live Preview