diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-26 08:31:19 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-26 08:31:19 (GMT) |
| commit | b914c388a809c17e4f76a4dcc1d3a1006e13c115 (patch) | |
| tree | ef6723688578c7ff13fed8b4ea0c961aaf98fe09 /tools | |
| parent | 7278c142089d46946d1ad2558eae949220dfe0c4 (diff) | |
| parent | d553f376a34ea1d27492a1a5fd14f79616f6a27c (diff) | |
| download | Qt-b914c388a809c17e4f76a4dcc1d3a1006e13c115.zip Qt-b914c388a809c17e4f76a4dcc1d3a1006e13c115.tar.gz Qt-b914c388a809c17e4f76a4dcc1d3a1006e13c115.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/network/access/qnetworkreplyimpl.cpp
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/tools/assistant/doc/assistant.qdocconf | 2 |
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 aca97ed..9566e90 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 © 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.5.2</div></td>\n" \ + "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.5.3</div></td>\n" \ "</tr></table></div></address>" |