Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir
authorMartin Smith <martin.smith@nokia.com>
Thu, 24 Feb 2011 10:48:32 +0000 (11:48 +0100)
committerMartin Smith <martin.smith@nokia.com>
Thu, 24 Feb 2011 10:48:32 +0000 (11:48 +0100)
commite51fda7db531628b54297ae020dda4a5f962d394
tree846fa261f80459529235e890ed897cf6186e9351
parent66aba9ad196c24d6844e39901bf152d0951ccfb7
parentc881e33e7e510204fabd061dac08a00b10b432fb
Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir
tools/qdoc3/doc/qdoc-manual.qdoc