Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorGeir Vattekar <geir.vattekar@nokia.com>
Thu, 9 Dec 2010 11:43:04 +0000 (12:43 +0100)
committerGeir Vattekar <geir.vattekar@nokia.com>
Thu, 9 Dec 2010 11:43:04 +0000 (12:43 +0100)
commit3b20e58b9494549713b492e35af6531b4bc179c9
tree9ae3fb2e2d02a78f6f2fe36adaad364170fd704c
parentbd4ac06eb3c8ac3a9044689481873ce91aeb3180
parent91518478d32a5d5ce188b02f92e744fc782dd687
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7