Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Thu, 7 Apr 2011 18:12:27 +0000 (20:12 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Thu, 7 Apr 2011 18:12:27 +0000 (20:12 +0200)
commit60553b6de3df0e708bbb9be02d1e88697a498012
tree9ed4af2d7fed8d91a669ee852f0e3456234d8967
parent384679ff46d2f970de3010fd6aac8a697dbfb907
parent779a58513f0c2d4e55410aee4cae6a6510841d57
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7