summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller/settings.h
diff options
context:
space:
mode:
authorNiels Weber <niels.2.weber@nokia.com>2012-02-06 09:52:58 +0100
committerTim Jenssen <tim.jenssen@nokia.com>2012-02-06 10:48:14 +0100
commit0bffa51527a186d8a925b6588e43eabaa6c644a4 (patch)
treeada50250c072e20b2efaa40933c70494d855b70a /installerbuilder/libinstaller/settings.h
parent91e4ca90408becb74e48b90c8105fd250201b6af (diff)
license header fixes
Change-Id: I47739f3b085b4fe1bb8c64eba1b0a74b6c999ee4 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerbuilder/libinstaller/settings.h')
-rw-r--r--installerbuilder/libinstaller/settings.h21
1 files changed, 14 insertions, 7 deletions
diff --git a/installerbuilder/libinstaller/settings.h b/installerbuilder/libinstaller/settings.h
index 84f726adb..0f06c2690 100644
--- a/installerbuilder/libinstaller/settings.h
+++ b/installerbuilder/libinstaller/settings.h
@@ -1,10 +1,11 @@
/**************************************************************************
**
-** This file is part of Installer Framework**
+** This file is part of Installer Framework
**
-** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
-** Contact: Nokia Corporation qt-info@nokia.com**
**
** GNU Lesser General Public License Usage
**
@@ -16,13 +17,19 @@
** 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 version
-** 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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
**
-** If you are unsure which license is appropriate for your use, please contact
-** (qt-info@nokia.com).
+** 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 info@qt.nokia.com.
**
**************************************************************************/
+
#ifndef SETTINGS_H
#define SETTINGS_H