diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-17 09:27:43 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-17 09:27:43 (GMT) |
| commit | cd43fc3a5fed0b3c45050d1fb286cef39ee1ac52 (patch) | |
| tree | 6b62676ed1a5f0e9cee9900391c1904bf51bd4c1 /src/gui/graphicsview/qgraphicslinearlayout.cpp | |
| parent | d72727cb7530da54b59c51effa97263512e9238c (diff) | |
| parent | fe59d3a82040e7202b4330a9da36fa4591e778c9 (diff) | |
| download | Qt-cd43fc3a5fed0b3c45050d1fb286cef39ee1ac52.zip Qt-cd43fc3a5fed0b3c45050d1fb286cef39ee1ac52.tar.gz Qt-cd43fc3a5fed0b3c45050d1fb286cef39ee1ac52.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'src/gui/graphicsview/qgraphicslinearlayout.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicslinearlayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp index 2f32950..2e78fc0 100644 --- a/src/gui/graphicsview/qgraphicslinearlayout.cpp +++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp @@ -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$ ** ****************************************************************************/ |