From bae9ef96b7e4396adead35a5e540fe4963326368 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 20 Dec 2012 21:45:57 +0100 Subject: Change copyright from Nokia to Digia Change-Id: Ie75877290e0bce06c8b5a24ed664e8aceaf2cac0 Reviewed-by: Andy Shaw Reviewed-by: Sergio Ahumada --- qtscriptclassic/src/qscriptstring.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'qtscriptclassic/src/qscriptstring.cpp') diff --git a/qtscriptclassic/src/qscriptstring.cpp b/qtscriptclassic/src/qscriptstring.cpp index 1a0932c..9a76335 100644 --- a/qtscriptclassic/src/qscriptstring.cpp +++ b/qtscriptclassic/src/qscriptstring.cpp @@ -1,12 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of a Qt Solutions component. +** This file is part of the Qt Solutions component. ** +** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: ** ** "Redistribution and use in source and binary forms, with or without @@ -18,10 +17,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,6 +34,8 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** +** $QT_END_LICENSE$ +** ****************************************************************************/ -- cgit v1.2.3