summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorninerider <qt-info@nokia.com>2009-11-16 08:16:11 (GMT)
committerninerider <qt-info@nokia.com>2009-11-16 08:16:11 (GMT)
commit4712a3a1ff6192f716d4f6894c6e69386ae55411 (patch)
treeea31bd6e1fae787b4980aeca6048f21c3c299a01 /tools
parent520ef13479e42b3eb1af96104fdad831905c53c2 (diff)
parentb84208e523354abf68904d0d494ab41015b19408 (diff)
downloadQt-4712a3a1ff6192f716d4f6894c6e69386ae55411.zip
Qt-4712a3a1ff6192f716d4f6894c6e69386ae55411.tar.gz
Qt-4712a3a1ff6192f716d4f6894c6e69386ae55411.tar.bz2
Merge remote branch 'origin/4.6' into 4.6-ce
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/lib/qhelp_global.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/lib/qhelp_global.cpp b/tools/assistant/lib/qhelp_global.cpp
index 980de27..749d2c9 100644
--- a/tools/assistant/lib/qhelp_global.cpp
+++ b/tools/assistant/lib/qhelp_global.cpp
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the Qt Assistant.
+** This file is part of the Qt Assistant of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage