diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2015-03-02 09:23:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2015-03-02 09:23:07 +0100 |
| commit | 2b5982aac8ad103443e33379fe5654f5bd419c87 (patch) | |
| tree | 8cc1d4e00029a6c0f5a23d87e9c97cdfc4619538 /doc/global/qt-module-defaults-online.qdocconf | |
| parent | efe3f631f232e6cc3966de59b9237653bf7fa96e (diff) | |
| parent | fc3733cba4652f2b8930c66665103fcb20874735 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I95b3a87c5068c6b8068b30a35655b4c2419e7f9e
Diffstat (limited to 'doc/global/qt-module-defaults-online.qdocconf')
| -rw-r--r-- | doc/global/qt-module-defaults-online.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 4cbd736097..3085b493fe 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -11,7 +11,7 @@ HTML.footer = \ " The documentation provided herein is licensed under the terms of the" \ " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \ " License version 1.3</a> as published by the Free Software Foundation. " \ - " The Qt Company, Qt and their respective logos are trademarks of The Qt Company Ltd " \ + " Qt and respective logos are trademarks of The Qt Company Ltd. " \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. </p>\n" |