diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-09 06:28:13 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-09 06:28:13 (GMT) |
| commit | b285f22389843925493be102b440dbd06c533878 (patch) | |
| tree | f0f1e0f6cbd97b17ffa237f013fcc77f1af5758c /src/opengl/qglshaderprogram.cpp | |
| parent | 6eb6920d134ee6a0cc0f27d63d65003a3d9c1fee (diff) | |
| parent | 08a6e65ce3b5cf45d10dd951606c6cb44b753daf (diff) | |
| download | Qt-b285f22389843925493be102b440dbd06c533878.zip Qt-b285f22389843925493be102b440dbd06c533878.tar.gz Qt-b285f22389843925493be102b440dbd06c533878.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index a43088c..0b7fe87 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.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 QtOpenGL module 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. |