Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 22 Aug 2011 12:30:23 +0000 (22:30 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 22 Aug 2011 12:30:23 +0000 (22:30 +1000)
commit72a71243262cd0152a92480395236486b89e0c4e
tree8b2480e7d2d6ee3fec4c27376f65ec963472e644
parent84408e18ac5a5ccc69cf34832f31ef63b3ff9f11
parentd62bb74d329b6ee5f6c52ac26e11bfe9a27f56a0
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Added an additional check to workaround an issue on Windows.