summaryrefslogtreecommitdiff
path: root/src/multimedia/doc/src/multimedia.qdoc
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2012-09-24 08:27:03 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-24 09:05:51 +0200
commitdcbbad869e28a398a880608ff634c6dd4241a7ef (patch)
tree5bedf73b573ddc96d3ac8af5f82844b5dca8169f /src/multimedia/doc/src/multimedia.qdoc
parent781c79c51d6d5f70ca1953d2034953500196d133 (diff)
downloadqtmultimedia-dcbbad869e28a398a880608ff634c6dd4241a7ef.tar.gz
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/multimedia/doc/src/multimedia.qdoc')
-rw-r--r--src/multimedia/doc/src/multimedia.qdoc28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index 78025afd9..203ccea03 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -1,26 +1,26 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012 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.
**
** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
**
****************************************************************************/