diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 08:07:29 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 08:07:29 +0100 |
| commit | 3794e55c2c8427dd8bd4f86af5e894cc80267881 (patch) | |
| tree | 9067656d5e021a585a976fb84f73b94e161cae19 /src/gui/text/qfontengine_s60.cpp | |
| parent | 7be079e1b1f13b58f5d69f86e5854edd25065532 (diff) | |
| parent | 99b19431e6846a36a65f23d21a95140a081d1f1a (diff) | |
| download | qt4-tools-3794e55c2c8427dd8bd4f86af5e894cc80267881.tar.gz | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
dist/changes-4.6.0
Diffstat (limited to 'src/gui/text/qfontengine_s60.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp index 88ae8f62ef..e279ad2278 100644 --- a/src/gui/text/qfontengine_s60.cpp +++ b/src/gui/text/qfontengine_s60.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtGui of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |