Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 12:04:15 +0000 (22:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 12:04:15 +0000 (22:04 +1000)
commit85f98f74e6c6baf2088d13feedf817a3b32ac1fb
tree3f7587326845026b9da80ca8645b727694c62744
parent19ed42109e1b8422863b401f1d1d79dca81d5780
parent365f4a0f9bbb437880fee7bd9b3964b7c7ece472
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  QmlDebug: Fix QmlOstPlugin compilation failure
  QmlDebug: Fix QmlOstPlugin compilation failure