summaryrefslogtreecommitdiff
path: root/src/corelib/arch/ia64/qatomic_ia64.s
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/arch/ia64/qatomic_ia64.s')
-rw-r--r--src/corelib/arch/ia64/qatomic_ia64.s21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/corelib/arch/ia64/qatomic_ia64.s b/src/corelib/arch/ia64/qatomic_ia64.s
index f23221bc62..c23b255f67 100644
--- a/src/corelib/arch/ia64/qatomic_ia64.s
+++ b/src/corelib/arch/ia64/qatomic_ia64.s
@@ -1,17 +1,19 @@
;/****************************************************************************
;**
-;** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+;** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
;** All rights reserved.
-;** Contact: Nokia Corporation (qt-info@nokia.com)
+;** Contact: http://www.qt-project.org/legal
;**
;** This file is part of the QtGui module of the Qt Toolkit.
;**
;** $QT_BEGIN_LICENSE:LGPL$
-;** Commercial Usage
-;** Licensees holding valid Qt Commercial licenses may use this file in
-;** accordance with the Qt Commercial License Agreement provided with the
+;** 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 Nokia.
+;** 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 Lesser General Public License Usage
;** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,8 +23,8 @@
;** 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
+;** In addition, as a special exception, Digia gives you certain additional
+;** rights. These rights are described in the Digia Qt LGPL Exception
;** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
;**
;** GNU General Public License Usage
@@ -33,8 +35,7 @@
;** ensure the GNU General Public License version 3.0 requirements will be
;** met: http://www.gnu.org/copyleft/gpl.html.
;**
-;** If you have questions regarding the use of this file, please contact
-;** Nokia at qt-info@nokia.com.
+;**
;** $QT_END_LICENSE$
;**
;****************************************************************************/