diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-25 15:04:11 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-25 15:04:11 (GMT) |
| commit | 0411ecc38e6c48263de3e5fef2bd8ba3adf61d97 (patch) | |
| tree | f555609fccea16128797b7951403ba9f459e9b62 /src/gui/image/qiconengineplugin.h | |
| parent | 5bda4e27bbe3fde98bd5c628fada76dfccadad0e (diff) | |
| parent | ede20ecdb0ddef7ef239900eb3bfa92ca859e010 (diff) | |
| download | Qt-0411ecc38e6c48263de3e5fef2bd8ba3adf61d97.zip Qt-0411ecc38e6c48263de3e5fef2bd8ba3adf61d97.tar.gz Qt-0411ecc38e6c48263de3e5fef2bd8ba3adf61d97.tar.bz2 | |
Merge branch 'master' into staging-1-master
Conflicts:
doc/src/getting-started/installation.qdoc
Diffstat (limited to 'src/gui/image/qiconengineplugin.h')
| -rw-r--r-- | src/gui/image/qiconengineplugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qiconengineplugin.h b/src/gui/image/qiconengineplugin.h index b64daff..aaac1a5 100644 --- a/src/gui/image/qiconengineplugin.h +++ b/src/gui/image/qiconengineplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |