Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 6 Dec 2011 15:21:31 +0000 (01:21 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 6 Dec 2011 15:21:31 +0000 (01:21 +1000)
commite1a6e877e5d3acfb29b291e946e836fbe3e25cb9
tree5c39f1e55b2e9dfcf3f391776e9a61b21137e0df
parent36ad9f6fe4e5cf41e393dd86b098c887c880dd47
parent73ee6ef3119df49c1fcc3c3478c9211379172a9a
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Fix declarative examples and demos issue on Windows