diff options
author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2011-02-23 20:32:21 (GMT) |
---|---|---|
committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2011-02-23 20:32:21 (GMT) |
commit | c881e33e7e510204fabd061dac08a00b10b432fb (patch) | |
tree | b5a5210eef8d309a17aca7d20b457879b584913f /tools/designer/src/components/taskmenu/taskmenu_component.h | |
parent | 309c48a70b46678ef92da441fcc2dc96ceb8fcf3 (diff) | |
parent | 3c982b5d214cc7a37ace1d956ac8fb0b9a281722 (diff) | |
download | Qt-c881e33e7e510204fabd061dac08a00b10b432fb.zip Qt-c881e33e7e510204fabd061dac08a00b10b432fb.tar.gz Qt-c881e33e7e510204fabd061dac08a00b10b432fb.tar.bz2 |
Merge branch '4.7' into mimir
Diffstat (limited to 'tools/designer/src/components/taskmenu/taskmenu_component.h')
-rw-r--r-- | tools/designer/src/components/taskmenu/taskmenu_component.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/components/taskmenu/taskmenu_component.h b/tools/designer/src/components/taskmenu/taskmenu_component.h index 50bd1a8..762567c 100644 --- a/tools/designer/src/components/taskmenu/taskmenu_component.h +++ b/tools/designer/src/components/taskmenu/taskmenu_component.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) ** |