diff options
| author | hjk <qtc-committer@nokia.com> | 2011-04-13 08:42:33 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2011-04-13 11:49:28 +0200 |
| commit | 839766396489249c541c60c92f717f77814dcf8b (patch) | |
| tree | 3e937237a26bdd8ef9ca5f5ee369d1dcec5f5891 /src/plugins/git/annotationhighlighter.cpp | |
| parent | 61790e54e8155e1e57bfdd372726dfb2117c4563 (diff) | |
| download | qt-creator-839766396489249c541c60c92f717f77814dcf8b.tar.gz | |
Update license.
Diffstat (limited to 'src/plugins/git/annotationhighlighter.cpp')
| -rw-r--r-- | src/plugins/git/annotationhighlighter.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/plugins/git/annotationhighlighter.cpp b/src/plugins/git/annotationhighlighter.cpp index 8c5a2d2947..22ca4e5685 100644 --- a/src/plugins/git/annotationhighlighter.cpp +++ b/src/plugins/git/annotationhighlighter.cpp @@ -4,28 +4,27 @@ ** ** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). ** -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Nokia Corporation (info@qt.nokia.com) ** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. ** ** GNU Lesser General Public License Usage ** -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** +** 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. +** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. ** |