summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-12-02 13:31:07 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-12-02 13:31:07 (GMT)
commitf29f1bb287c6b39bd1270802d1579f1c1d53f905 (patch)
treef903e18b163591c3590473e4a117a3c8958d8847 /tools/assistant
parent271936b063fb261293e3f77f7a2273e3a4dbb5d6 (diff)
parent25023911295c201758faaa2c800b2388ddf1e0b0 (diff)
downloadQt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.zip
Qt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.tar.gz
Qt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.tar.bz2
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'tools/assistant')
-rw-r--r--tools/assistant/tools/assistant/doc/assistant.qdocconf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf
index 161d34f..0a7ffe0 100644
--- a/tools/assistant/tools/assistant/doc/assistant.qdocconf
+++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf
@@ -12,5 +12,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
"<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
"<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
- "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.0</div></td>\n" \
+ "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.1</div></td>\n" \
"</tr></table></div></address>"