summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qdrawhelper_armv6_rvct.s
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/painting/qdrawhelper_armv6_rvct.s')
-rw-r--r--src/gui/painting/qdrawhelper_armv6_rvct.s26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/painting/qdrawhelper_armv6_rvct.s b/src/gui/painting/qdrawhelper_armv6_rvct.s
index 51b67a4..477169b 100644
--- a/src/gui/painting/qdrawhelper_armv6_rvct.s
+++ b/src/gui/painting/qdrawhelper_armv6_rvct.s
@@ -9,8 +9,8 @@
;** 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 either Technology Preview License Agreement or the
-;** Beta Release License Agreement.
+;** 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
@@ -21,20 +21,20 @@
;** 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.0, included in the file LGPL_EXCEPTION.txt in this
+;** 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.
;**
-;** 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.
+;** If you have questions regarding the use of this file, please contact
+;** Nokia at qt-info@nokia.com.
+;**
+;**
+;**
+;**
+;**
+;**
+;**
;**
-;** If you are unsure which license is appropriate for your use, please
-;** contact the sales department at http://qt.nokia.com/contact.
;** $QT_END_LICENSE$
;**
;****************************************************************************/