Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Mon, 6 Dec 2010 18:00:42 +0000 (19:00 +0100)
committerDavid Boddie <david.boddie@nokia.com>
Mon, 6 Dec 2010 18:00:42 +0000 (19:00 +0100)
commit34bfad76d1afe4a0ee27496e740c8566387dc16c
treec4304699a1a2d4a729bddfb3102a5ba3ad9a2cd8
parent16c3df54960b776f35f59288b888e829e7e81002
parent608b66b5af75ae6982be428439eea735c00cc455
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7