summaryrefslogtreecommitdiffstats
path: root/tools/assistant/compat/fontsettingsdialog.cpp
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2010-01-13 14:29:35 (GMT)
committerIain <qt-info@nokia.com>2010-01-13 14:29:35 (GMT)
commitd7d67cc18a7a51703aa2cd4a8b0c64fa8cadf6a7 (patch)
treed594db6d7df67f51cd3596ad1e6fcc7b3edfeb85 /tools/assistant/compat/fontsettingsdialog.cpp
parentf247315cece2929d471eebfbd7e40bfb4eca831b (diff)
parent1cb8e4b9a569023ad44060252df0b891c1a331d1 (diff)
downloadQt-d7d67cc18a7a51703aa2cd4a8b0c64fa8cadf6a7.zip
Qt-d7d67cc18a7a51703aa2cd4a8b0c64fa8cadf6a7.tar.gz
Qt-d7d67cc18a7a51703aa2cd4a8b0c64fa8cadf6a7.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'tools/assistant/compat/fontsettingsdialog.cpp')
-rw-r--r--tools/assistant/compat/fontsettingsdialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/compat/fontsettingsdialog.cpp b/tools/assistant/compat/fontsettingsdialog.cpp
index ab338db..31a3241 100644
--- a/tools/assistant/compat/fontsettingsdialog.cpp
+++ b/tools/assistant/compat/fontsettingsdialog.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)
**