diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-24 16:02:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-24 16:02:55 +0100 |
| commit | 627d9cbd3c45834fe7aa1f2ee37fdfca07a03976 (patch) | |
| tree | c0805165804b2a9ef809318dd6a84132d2e57744 /doc/global/qt-html-templates-online.qdocconf | |
| parent | fed2d237b71ac2f586dca0d35d104e7cf0cd9bd2 (diff) | |
| parent | 1b5f9bec03901519db3694d1b51fa7989ade1f25 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
Change-Id: I4ca87d44129fa5c1d8541cd58b8d62bc69080688
Diffstat (limited to 'doc/global/qt-html-templates-online.qdocconf')
| -rw-r--r-- | doc/global/qt-html-templates-online.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf index 040a5483c2..c794c47679 100644 --- a/doc/global/qt-html-templates-online.qdocconf +++ b/doc/global/qt-html-templates-online.qdocconf @@ -54,7 +54,7 @@ HTML.footer = \ "</div>\n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2012 Digia Plc and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ " their respective owners.</p>\n" \ " <br />\n" \ |