diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 08:24:39 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-04 08:24:39 (GMT) |
| commit | 92a3662564f421a46761989d153f6c8eb990131f (patch) | |
| tree | 63910a248879fb2b4007450fed01f37626355bbb /src/corelib | |
| parent | 2e1653563a801909788c912ed8071afe8bf4ba05 (diff) | |
| parent | d22b55d3159c001dc6b37422cefbec6775996494 (diff) | |
| download | Qt-92a3662564f421a46761989d153f6c8eb990131f.zip Qt-92a3662564f421a46761989d153f6c8eb990131f.tar.gz Qt-92a3662564f421a46761989d153f6c8eb990131f.tar.bz2 | |
Merge branch '4.5' into 4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/i386/qatomic_i386.s | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/corelib/arch/i386/qatomic_i386.s b/src/corelib/arch/i386/qatomic_i386.s index 63facc1..08158f9 100644 --- a/src/corelib/arch/i386/qatomic_i386.s +++ b/src/corelib/arch/i386/qatomic_i386.s @@ -1,43 +1,3 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! -!! Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -!! Contact: Nokia Corporation (qt-info@nokia.com) -!! -!! 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. -!! -!! 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. -!! -!! -!! -!! -!! -!! -!! -!! -!! $QT_END_LICENSE$ -!! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .text .align 4,0x90 |