diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-09 08:47:04 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-09 08:47:04 (GMT) |
| commit | 6bdc4043f4d89da39cbbf67a5db4f0e308b632f1 (patch) | |
| tree | e4838e4e7c527b71c72706e85c8b3cc0eef322f8 /src/opengl/qglpixelbuffer_win.cpp | |
| parent | 67645790afd965e3fdf312d5233d7c2f0dc3619a (diff) | |
| parent | c363cd989a07056b0b8ea39e44c719512bb1e619 (diff) | |
| download | Qt-6bdc4043f4d89da39cbbf67a5db4f0e308b632f1.zip Qt-6bdc4043f4d89da39cbbf67a5db4f0e308b632f1.tar.gz Qt-6bdc4043f4d89da39cbbf67a5db4f0e308b632f1.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/opengl/qpaintengine_opengl.cpp
Diffstat (limited to 'src/opengl/qglpixelbuffer_win.cpp')
| -rw-r--r-- | src/opengl/qglpixelbuffer_win.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qglpixelbuffer_win.cpp b/src/opengl/qglpixelbuffer_win.cpp index 47e9942..71b37ca 100644 --- a/src/opengl/qglpixelbuffer_win.cpp +++ b/src/opengl/qglpixelbuffer_win.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. |