summaryrefslogtreecommitdiff
path: root/src/plugins/mercurial/mercurialcontrol.h
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2010-12-17 16:01:08 +0100
committercon <qtc-committer@nokia.com>2010-12-17 16:03:42 +0100
commit04e32b0049d4e282e5e0991197bbf96714b3ef53 (patch)
tree8b42b41930553cb11601d3364b2662febe78ad2f /src/plugins/mercurial/mercurialcontrol.h
parentcb571a9f5a1717956b009741a4d5a18feb6afe35 (diff)
downloadqt-creator-04e32b0049d4e282e5e0991197bbf96714b3ef53.tar.gz
License headers.
Diffstat (limited to 'src/plugins/mercurial/mercurialcontrol.h')
-rw-r--r--src/plugins/mercurial/mercurialcontrol.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/plugins/mercurial/mercurialcontrol.h b/src/plugins/mercurial/mercurialcontrol.h
index 3f0465d380..6eda678d79 100644
--- a/src/plugins/mercurial/mercurialcontrol.h
+++ b/src/plugins/mercurial/mercurialcontrol.h
@@ -6,12 +6,12 @@
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** Commercial Usage
+** No Commercial Usage
**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** 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
**
@@ -22,8 +22,12 @@
** 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.
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
**
**************************************************************************/