diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 09:34:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 09:34:09 (GMT) |
| commit | c7ca3da5ec1586083dfc4425200508929756ad61 (patch) | |
| tree | 703d4ca6e0f7fde041af5d7d1bca78050365d880 /tools | |
| parent | 69b88e97a02b41f3ffb88cbac09a5096da6c520d (diff) | |
| parent | 7bee9774dfe4b09ca8c8e6a63d0de34737a1aaa0 (diff) | |
| download | Qt-c7ca3da5ec1586083dfc4425200508929756ad61.zip Qt-c7ca3da5ec1586083dfc4425200508929756ad61.tar.gz Qt-c7ca3da5ec1586083dfc4425200508929756ad61.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: correcting a character bug in the footer.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 158aef3..8253c45 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -113,7 +113,7 @@ HTML.footer = " </div>\n" \ " <div class=\"footer\">\n" \ " <p>\n" \ " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \ - " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation>\n" \ + " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ " All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \ |