diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-01-17 16:06:10 +0100 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-01-17 16:06:10 +0100 |
| commit | 97668bd920685d25faf82bfde2027305e67b202e (patch) | |
| tree | 9e2f1efc273ffde3c80df5ddedd19d3b448208b9 /src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | |
| parent | 72aa2eb43b0cf5a6eef940da05ac58f605794ffb (diff) | |
| parent | 77c4df1325c4bae10c99978a325febada9fd82d0 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alien-squached
Conflicts:
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/kernel/qcocoaview_mac.mm
src/gui/kernel/qwidget_mac.mm
Diffstat (limited to 'src/gui/kernel/qcocoasharedwindowmethods_mac_p.h')
| -rw-r--r-- | src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h index c71d476fb8..1c9258afa3 100644 --- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h +++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.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) ** |