diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-12 20:20:01 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-12 20:20:01 +0100 |
| commit | 417dd757e8d78d226fc61f6302823bdb6ec09f64 (patch) | |
| tree | 7f1d78d88933c5e23294d66e7bb176437464ea3c /src/gui/text/qfont.cpp | |
| parent | f71b48c70e215fec77be3b2688ac197cd7f13525 (diff) | |
| parent | 796f8235d1d41878030e6992a225fafb1ee64fbe (diff) | |
Merge remote branch 'qt/4.6' into oslo-staging-2/4.6
Conflicts:
dist/changes-4.6.1
Diffstat (limited to 'src/gui/text/qfont.cpp')
| -rw-r--r-- | src/gui/text/qfont.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index b414263022..4c57dfff0a 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -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) ** |