diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:37:41 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-10 10:38:21 +0100 |
| commit | ccb52b1e964d45da5b0b212e16be6b42d02599c1 (patch) | |
| tree | 371146c4b45e2ede77c9df8316a61f35ba38b567 /doc | |
| parent | 5a76672a356c4d1fae1b087137426f904af6e784 (diff) | |
| parent | 6c4215658a40e761b9869e9c4c206966282dba96 (diff) | |
| download | qtdoc-ccb52b1e964d45da5b0b212e16be6b42d02599c1.tar.gz | |
Merge remote-tracking branch 'origin/5.4.1' into 5.4
Conflicts:
LICENSE.GPLv2
Change-Id: If9f48f3dcee827a68c965ed77dc3fee7d65c24e5
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/legal/fdl.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/legal/lgpl.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/modules.qdoc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/legal/fdl.qdoc b/doc/src/legal/fdl.qdoc index e2a90d0d..2ba8b184 100644 --- a/doc/src/legal/fdl.qdoc +++ b/doc/src/legal/fdl.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -35,7 +35,7 @@ Alternatively, you may use the documentation in accordance with the terms contained in a written agreement between you and Digia. - The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.\br + The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies) and other contributors.\br Contact: \l{http://www.qt-project.org/legal} Reference: \l{GNU Free Documentation License} diff --git a/doc/src/legal/lgpl.qdoc b/doc/src/legal/lgpl.qdoc index f3ec6b04..79047c53 100644 --- a/doc/src/legal/lgpl.qdoc +++ b/doc/src/legal/lgpl.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -32,7 +32,7 @@ Qt is available under the GNU Lesser General Public License version 3 and the GNU Lesser General Public License version 2.1. - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies) and other contributors.\br + The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies) and other contributors.\br Contact: http://www.qt-project.org/legal References: diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index c4132c3b..b4f6a430 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -53,7 +53,7 @@ the following license. \legalese - Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).\br + Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).\br Contact: http://www.qt-project.org/legal You may use this file under the terms of the BSD license as follows: |