diff options
| author | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-03-16 11:29:20 (GMT) |
|---|---|---|
| committer | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-03-16 11:29:20 (GMT) |
| commit | 39dcac49c9a20eaa9b347276d97547461c3904aa (patch) | |
| tree | 8a0cc8574bed910f24438ee0fe5fb961021b3a65 /src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h | |
| parent | 82198dd1f7049cec89271b0ea82521752cc13c05 (diff) | |
| parent | e318b0276c3d4a0db8660b4fa6d68f1784aee522 (diff) | |
| download | Qt-39dcac49c9a20eaa9b347276d97547461c3904aa.zip Qt-39dcac49c9a20eaa9b347276d97547461c3904aa.tar.gz Qt-39dcac49c9a20eaa9b347276d97547461c3904aa.tar.bz2 | |
Merge remote branch 'qt-master/master'
Conflicts:
src/corelib/thread/qthread_unix.cpp
Diffstat (limited to 'src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h')
| -rw-r--r-- | src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h b/src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h index 84f0699..64a3623 100644 --- a/src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h +++ b/src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.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) ** |