diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-24 15:29:17 +0200 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-24 15:29:17 +0200 |
commit | 06d32b235a21fb612972d248089805423a97bc18 (patch) | |
tree | 2fa2c5045322ec7e1677d2f5a4d45e2df565b19a /src/corelib/arch/sparc/qatomic64.s | |
parent | 9face4b88de2db6f552149d2f96257620e971a59 (diff) | |
parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
download | qt4-tools-06d32b235a21fb612972d248089805423a97bc18.tar.gz |
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'src/corelib/arch/sparc/qatomic64.s')
-rw-r--r-- | src/corelib/arch/sparc/qatomic64.s | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/corelib/arch/sparc/qatomic64.s b/src/corelib/arch/sparc/qatomic64.s index f826311da4..d78b5b628e 100644 --- a/src/corelib/arch/sparc/qatomic64.s +++ b/src/corelib/arch/sparc/qatomic64.s @@ -7,29 +7,29 @@ !! This file is part of the QtGui module of the Qt Toolkit. !! !! $QT_BEGIN_LICENSE:LGPL$ -!! 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. !! -!! If you have questions regarding the use of this file, please contact -!! Nokia at qt-info@nokia.com. -!! -!! +!! GNU General Public License Usage +!! Alternatively, this file may be used under the terms of the GNU General +!! Public License version 3.0 as published by the Free Software Foundation +!! and appearing in the file LICENSE.GPL included in the packaging of this +!! file. Please review the following information to ensure the GNU General +!! Public License version 3.0 requirements will be met: +!! http://www.gnu.org/copyleft/gpl.html. !! +!! 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. !! !! !! |