summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-html-templates.qdocconf
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-02-03 12:38:35 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-02-03 12:38:35 (GMT)
commit22ea0648e446136cc2a301ec3a38019ed6a3bd6e (patch)
tree22466b217156cdca9207ac215ac6a34681af659e /tools/qdoc3/test/qt-html-templates.qdocconf
parent1e7ab0e849900bacf71935f2a2150116b8dc17d1 (diff)
parent2bbd2780b9028f9d765384868796424582b2fe6a (diff)
downloadQt-22ea0648e446136cc2a301ec3a38019ed6a3bd6e.zip
Qt-22ea0648e446136cc2a301ec3a38019ed6a3bd6e.tar.gz
Qt-22ea0648e446136cc2a301ec3a38019ed6a3bd6e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7
Diffstat (limited to 'tools/qdoc3/test/qt-html-templates.qdocconf')
-rw-r--r--tools/qdoc3/test/qt-html-templates.qdocconf2
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 e2d2b4a..6f756da 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -23,7 +23,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" \