Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team
authorMartin Smith <martin.smith@nokia.com>
Mon, 31 Oct 2011 09:54:18 +0000 (10:54 +0100)
committerMartin Smith <martin.smith@nokia.com>
Mon, 31 Oct 2011 09:54:18 +0000 (10:54 +0100)
commit8cddbc732c3242e53aea3f05df888c9ded2964b8
tree1467d1aba4bda85fc8d89f79d453cdd37c3e1828
parent727c76a96ad0c6c99ca80ce9e00a49bdbc416720
parentcf5695691682957b68b67fd951addf4a52bfba84
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team