summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/declarative/codingconventions/javascript.qml
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-09-20 13:44:09 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-09-20 13:44:09 (GMT)
commita981eca89e70f3d1c6198b5a5c5693bb7dec934d (patch)
treea02744ec77f9229373e115b88d80f126c7d56ae7 /doc/src/snippets/declarative/codingconventions/javascript.qml
parent3e8890977256186d6a0d84f080f52e17c2871ef8 (diff)
parente7000e016e82ca9ca64db9246ccbef8fc1efa279 (diff)
downloadQt-a981eca89e70f3d1c6198b5a5c5693bb7dec934d.zip
Qt-a981eca89e70f3d1c6198b5a5c5693bb7dec934d.tar.gz
Qt-a981eca89e70f3d1c6198b5a5c5693bb7dec934d.tar.bz2
Merge branch '4.7' into mimir
Diffstat (limited to 'doc/src/snippets/declarative/codingconventions/javascript.qml')
-rw-r--r--doc/src/snippets/declarative/codingconventions/javascript.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/declarative/codingconventions/javascript.qml b/doc/src/snippets/declarative/codingconventions/javascript.qml
index fd19b02..90790b9 100644
--- a/doc/src/snippets/declarative/codingconventions/javascript.qml
+++ b/doc/src/snippets/declarative/codingconventions/javascript.qml
@@ -4,7 +4,7 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** You may use this file under the terms of the BSD license as follows: