diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 01:14:52 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 01:14:52 (GMT) |
| commit | 91a2da396fb476401e3b2c55ca7672a8b462ceca (patch) | |
| tree | dc944bf7d6df0fc0e2b0bad290396084626dd898 /util | |
| parent | 530fd3831f012337d7460c4387ce82083ab3e144 (diff) | |
| parent | 5f92bc9dd9f05f4824711b03406bdbe222ff73e9 (diff) | |
| download | Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.zip Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.gz Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.bz2 | |
Merge branch '4.6' of ../qt into kinetic-declarativeui
Conflicts:
src/corelib/kernel/qobject.cpp
Diffstat (limited to 'util')
| -rw-r--r-- | util/qlalr/doc/qlalr.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/qlalr/doc/qlalr.qdocconf b/util/qlalr/doc/qlalr.qdocconf index 391844b..ea9eaa6 100644 --- a/util/qlalr/doc/qlalr.qdocconf +++ b/util/qlalr/doc/qlalr.qdocconf @@ -59,7 +59,7 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0 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=\"30%\" align=\"left\">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \ "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \ "</tr></table></div></address>" |