Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Wed, 3 Nov 2010 15:45:56 +0000 (16:45 +0100)
committerDavid Boddie <david.boddie@nokia.com>
Wed, 3 Nov 2010 15:45:56 +0000 (16:45 +0100)
commitbaefea22f3286f731272b867da76d5662e9353b0
treebb64609791cfda6326e852f91af70cd8a9f49e70
parent0b9aa12659d5ea6b15fe72f963cc98db9af585fc
parent18b6067fa99004d1572e3d6b8fbc181729ad96be
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7