summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-17 16:43:48 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-17 16:43:48 (GMT)
commitcb5e66d1d43c0cf452aff0e437a2ea9011c6b659 (patch)
tree0aa5378385a5492e4fe55c7b7003cd32f83bf6b6 /tools/assistant
parent798ff84b2bd26da5ba2d01bf44e4a4d40dfcacac (diff)
parent334b2a93d461ae9a8b258fff1971fb775b13bb68 (diff)
downloadQt-cb5e66d1d43c0cf452aff0e437a2ea9011c6b659.zip
Qt-cb5e66d1d43c0cf452aff0e437a2ea9011c6b659.tar.gz
Qt-cb5e66d1d43c0cf452aff0e437a2ea9011c6b659.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/assistant')
-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