diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-26 13:17:08 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-26 13:17:08 (GMT) |
| commit | b0390e68893dd04076434695be5e676b87bc067c (patch) | |
| tree | 60543fd8cf8c72f530a8865fa8fc2306bb52b9ba /src/plugins/platforms | |
| parent | 537312d5dea24bd404666789119a5ad1bab04396 (diff) | |
| parent | 57a4353c8e082dfc0f536a1e642e4a8df0e5b9c9 (diff) | |
| download | Qt-b0390e68893dd04076434695be5e676b87bc067c.zip Qt-b0390e68893dd04076434695be5e676b87bc067c.tar.gz Qt-b0390e68893dd04076434695be5e676b87bc067c.tar.bz2 | |
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/openkode/shaders/vert.glslv | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/openvglite/qwindowsurface_vglite.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/openkode/shaders/vert.glslv b/src/plugins/platforms/openkode/shaders/vert.glslv index 8a64f4d..cc40985 100644 --- a/src/plugins/platforms/openkode/shaders/vert.glslv +++ b/src/plugins/platforms/openkode/shaders/vert.glslv @@ -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) ** diff --git a/src/plugins/platforms/openvglite/qwindowsurface_vglite.h b/src/plugins/platforms/openvglite/qwindowsurface_vglite.h index 59faba8..b7d0a92 100644 --- a/src/plugins/platforms/openvglite/qwindowsurface_vglite.h +++ b/src/plugins/platforms/openvglite/qwindowsurface_vglite.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 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) ** |