diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-11 03:48:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-11 03:48:51 (GMT) |
| commit | 4f3587e749a8503f6207174705ed5db74affb3a5 (patch) | |
| tree | 29bb27e481bab4e1b63f5f04967f59f10328a8ea /tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf | |
| parent | c765eb96672b6501f13491f6e9f7e7ed46ba9385 (diff) | |
| parent | ce59628ba366800fe2f3afdadc37be02f98480a7 (diff) | |
| download | Qt-4f3587e749a8503f6207174705ed5db74affb3a5.zip Qt-4f3587e749a8503f6207174705ed5db74affb3a5.tar.gz Qt-4f3587e749a8503f6207174705ed5db74affb3a5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Update copyright year to 2011.
Diffstat (limited to 'tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf index 285ec27..ed2162e 100644 --- a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf @@ -149,7 +149,7 @@ HTML.footer = \ " </div> \n" \ " <div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2010 Nokia Corporation and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2011 Nokia Corporation and/or its\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" \ |