diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-22 11:26:08 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-02-22 11:26:08 (GMT) |
| commit | 97930918c8f5d20c6a27c22a1f0670ac7576c17a (patch) | |
| tree | 688f93eacf376df07679f06203834e44143103fa /doc/src/snippets/code | |
| parent | 80fc5bf17e5f049a395d6a5612843c69c5b0fde1 (diff) | |
| parent | 66818ea9bc50af50bb26515cf667fe1c0c62a12d (diff) | |
| download | Qt-97930918c8f5d20c6a27c22a1f0670ac7576c17a.zip Qt-97930918c8f5d20c6a27c22a1f0670ac7576c17a.tar.gz Qt-97930918c8f5d20c6a27c22a1f0670ac7576c17a.tar.bz2 | |
Merge remote branch 'origin/master' into qtruntime
Conflicts:
src/declarative/qml/qml.pri
src/declarative/qml/qmlengine.cpp
src/declarative/util/qmlview.h
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp b/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp index a18971d..1b1abea 100644 --- a/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp +++ b/doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the test suite of the Qt Toolkit. +** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |