diff options
| author | mread <qt-info@nokia.com> | 2009-08-07 13:34:12 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-07 13:34:12 (GMT) |
| commit | 5a72890b7ce12815f9567316da867006cff73f39 (patch) | |
| tree | 46c8c793f19274f9ed19678d1732d2123adbdf34 /src/gui/painting/qdrawhelper_armv6_rvct.s | |
| parent | 0f6f1f841cea61cbb6905de92c2ca63bd369d55d (diff) | |
| parent | cc0a411e5e874aa224c26298a109973cb15ea291 (diff) | |
| download | Qt-5a72890b7ce12815f9567316da867006cff73f39.zip Qt-5a72890b7ce12815f9567316da867006cff73f39.tar.gz Qt-5a72890b7ce12815f9567316da867006cff73f39.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts fixed:
src/corelib/io/qdiriterator.cpp
Diffstat (limited to 'src/gui/painting/qdrawhelper_armv6_rvct.s')
| -rw-r--r-- | src/gui/painting/qdrawhelper_armv6_rvct.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawhelper_armv6_rvct.s b/src/gui/painting/qdrawhelper_armv6_rvct.s index dd29f80..215bdaf 100644 --- a/src/gui/painting/qdrawhelper_armv6_rvct.s +++ b/src/gui/painting/qdrawhelper_armv6_rvct.s @@ -1,7 +1,7 @@ ;/**************************************************************************** ;** ;** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -;** Contact: Qt Software Information (qt-info@nokia.com) +;** Contact: Nokia Corporation (qt-info@nokia.com) ;** ;** This file is part of the QtGui module of the Qt Toolkit. ;** @@ -34,7 +34,7 @@ ;** met: http://www.gnu.org/copyleft/gpl.html. ;** ;** If you are unsure which license is appropriate for your use, please -;** contact the sales department at qt-sales@nokia.com. +;** contact the sales department at http://www.qtsoftware.com/contact. ;** $QT_END_LICENSE$ ;** ;****************************************************************************/ |