Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Wed, 27 Oct 2010 15:05:59 +0000 (17:05 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Wed, 27 Oct 2010 15:05:59 +0000 (17:05 +0200)
commit7ca94a08b9c232aaccb74fa85912515b8f9a6619
treee60229477bc8269cf14904620bf0fc5ad18ef6d0
parentf8c9314d6224948c28487e291b4cdad0049682c7
parent7285c09ef777569514e73dffa22ecfdb7df6ba8f
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7