diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-09 16:01:40 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-09 16:01:48 +0100 |
| commit | e39af4464b0acb9fadc211670093670a1ede5c2e (patch) | |
| tree | 6d8e4e81eb89a407bec4b44a198247c15caece4c /doc/config | |
| parent | 112eaad56141e0e62fd09648e19a1c3e3456f10b (diff) | |
| parent | e31b4a2bcc214e33cdc91a1aad52b95904a03091 (diff) | |
Merge remote-tracking branch 'origin/1.1'
Change-Id: Iccf01f1dad3fca4a78c7d9b795fdef6df0181e9b
Diffstat (limited to 'doc/config')
| -rw-r--r-- | doc/config/qt-html-templates.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf index 36919f255..bd9bcaeb8 100644 --- a/doc/config/qt-html-templates.qdocconf +++ b/doc/config/qt-html-templates.qdocconf @@ -24,7 +24,7 @@ HTML.footer = \ "</div> \n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2008-2013 Digia Plc and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2008-2014 Digia Plc and/or its\n" \ " subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Corporation \n" \ " in Finland and/or other countries worldwide.</p>\n" \ " <p>\n" \ |