diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:04:57 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:04:57 (GMT) |
| commit | 2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398 (patch) | |
| tree | 3833140ddaca4723f452ffa6de973784380d91b2 /tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf | |
| parent | 649e65519bef38948a818f282e3022d034dc80a5 (diff) | |
| parent | 4f3587e749a8503f6207174705ed5db74affb3a5 (diff) | |
| download | Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.zip Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.gz Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into qt-master-from-4.7
Conflicts:
src/s60installs/eabi/QtOpenVGu.def
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" \ |