summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-03-15 08:20:19 (GMT)
committeraavit <qt-info@nokia.com>2011-03-15 08:20:19 (GMT)
commit3c20b3ed8e89e351f1fb459e6ff5439f30958141 (patch)
tree2cae81c1eaa9f38de997a09aca5340978734ee07 /tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
parent25a30c8e258df642a1aa2ffcfb162633611e7259 (diff)
parentc0cd8db0498daaa8151d1f80143b6849016bdc7c (diff)
downloadQt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.zip
Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.gz
Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.bz2
Merge remote branch 'qt-mainline/master'
Diffstat (limited to 'tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf')
-rw-r--r--tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
index 18ed5c1..74a4d14 100644
--- a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
@@ -36,7 +36,7 @@ HTML.footer = \
" </div> \n" \
" <div class=\"footer\">\n" \
" <p>\n" \
- " <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+ " <acronym title=\"Copyright\">&copy;</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" \