diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-30 06:37:33 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-09-30 06:37:33 (GMT) |
| commit | 828b776f0a9ff84288e6be1bbbdb91448ca1bd4d (patch) | |
| tree | ce4419b9c72a9a53c3ad3de9568b9cc89f9cf0bf /demos/chip/main.cpp | |
| parent | 3c3745c29d9fbae98b55a88b5ebccb0b29b4eed5 (diff) | |
| parent | b83ea4276a242893c01586a5f1a2d62d54369cfa (diff) | |
| download | Qt-828b776f0a9ff84288e6be1bbbdb91448ca1bd4d.zip Qt-828b776f0a9ff84288e6be1bbbdb91448ca1bd4d.tar.gz Qt-828b776f0a9ff84288e6be1bbbdb91448ca1bd4d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'demos/chip/main.cpp')
| -rw-r--r-- | demos/chip/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/demos/chip/main.cpp b/demos/chip/main.cpp index 4b39cdc..981bc59 100644 --- a/demos/chip/main.cpp +++ b/demos/chip/main.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the demonstration applications of the Qt Toolkit. @@ -20,10 +21,9 @@ ** 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. +** 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. |