Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorMartin Smith <martin.smith@nokia.com>
Mon, 4 Oct 2010 11:40:45 +0000 (13:40 +0200)
committerMartin Smith <martin.smith@nokia.com>
Mon, 4 Oct 2010 11:40:45 +0000 (13:40 +0200)
commit6f811c74237c4c4b3618fa879253435f1bb5b7a6
treeb10925754df0608beb5de941b5c1ea4da1f3bd55
parentf7be8a1ccd69c34c1f2406be625e2c60901d8e9e
parent9d0317c91dbbe660af2ed2aa8ea47446049467d2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7