diff options
| author | Tobias Koenig <tokoe@kde.org> | 2009-07-05 08:47:45 (GMT) |
|---|---|---|
| committer | Tobias Koenig <tokoe@kde.org> | 2009-07-05 08:47:45 (GMT) |
| commit | 5db5a9d5d878157a643a441d426ff739084ca031 (patch) | |
| tree | d10017bbc11e62e44a7ced7e35de8516964e794a /doc/src/examples/qtconcurrent-imagescaling.qdoc | |
| parent | 65c2d095cddfda32052925654dd1defd314ad4b3 (diff) | |
| parent | 84bbac2a4d7b663e57b74094cbebf8fca16e0ed8 (diff) | |
| download | Qt-5db5a9d5d878157a643a441d426ff739084ca031.zip Qt-5db5a9d5d878157a643a441d426ff739084ca031.tar.gz Qt-5db5a9d5d878157a643a441d426ff739084ca031.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/qt/qt
Diffstat (limited to 'doc/src/examples/qtconcurrent-imagescaling.qdoc')
| -rw-r--r-- | doc/src/examples/qtconcurrent-imagescaling.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/examples/qtconcurrent-imagescaling.qdoc b/doc/src/examples/qtconcurrent-imagescaling.qdoc index 74b4be0..2b86ce6 100644 --- a/doc/src/examples/qtconcurrent-imagescaling.qdoc +++ b/doc/src/examples/qtconcurrent-imagescaling.qdoc @@ -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 documentation 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$ ** ****************************************************************************/ |