diff options
author | aavit <qt-info@nokia.com> | 2011-03-15 08:20:19 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2011-03-15 08:20:19 (GMT) |
commit | 3c20b3ed8e89e351f1fb459e6ff5439f30958141 (patch) | |
tree | 2cae81c1eaa9f38de997a09aca5340978734ee07 /src/gui/text/qglyphs_p.h | |
parent | 25a30c8e258df642a1aa2ffcfb162633611e7259 (diff) | |
parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
download | Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.zip Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.gz Qt-3c20b3ed8e89e351f1fb459e6ff5439f30958141.tar.bz2 |
Merge remote branch 'qt-mainline/master'
Diffstat (limited to 'src/gui/text/qglyphs_p.h')
-rw-r--r-- | src/gui/text/qglyphs_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qglyphs_p.h b/src/gui/text/qglyphs_p.h index c39f5d0..c632e2f 100644 --- a/src/gui/text/qglyphs_p.h +++ b/src/gui/text/qglyphs_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) ** |