diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-17 10:35:59 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-17 10:35:59 (GMT) |
| commit | eceeb831ea81f944210c039abdb8db146675e673 (patch) | |
| tree | 2469801b461ed7a2f918a502ec2cb5a7ff05f891 /src/plugins/platforms/eglconvenience/qeglconvenience.h | |
| parent | f3ec9966ab23d1c4e56e17e593b99165364612ab (diff) | |
| parent | cbf6c5b810316efba3ccfb27f05576b8dbfe3890 (diff) | |
| download | Qt-eceeb831ea81f944210c039abdb8db146675e673.zip Qt-eceeb831ea81f944210c039abdb8db146675e673.tar.gz Qt-eceeb831ea81f944210c039abdb8db146675e673.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into lighthouse-master
Conflicts:
mkspecs/qws/macx-nacl-g++/qplatformdefs.h
Diffstat (limited to 'src/plugins/platforms/eglconvenience/qeglconvenience.h')
| -rw-r--r-- | src/plugins/platforms/eglconvenience/qeglconvenience.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglconvenience/qeglconvenience.h b/src/plugins/platforms/eglconvenience/qeglconvenience.h index 681e9db..8668095 100644 --- a/src/plugins/platforms/eglconvenience/qeglconvenience.h +++ b/src/plugins/platforms/eglconvenience/qeglconvenience.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |