summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-22 09:00:29 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-22 09:00:29 (GMT)
commit6d23a6d0a2954a4895dd5c1cfade28eab5a2874e (patch)
treef2f1709febef96b8eec5fcf5f450abe50759a4c7 /doc/src/snippets
parent746be2ba8d54e2c9803af6a6ba3cc0b6bf1da258 (diff)
parente2f90ecdde9550986df1539aa88eb5fc41d939e1 (diff)
downloadQt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.zip
Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.tar.gz
Qt-6d23a6d0a2954a4895dd5c1cfade28eab5a2874e.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/audio/main.cpp2
-rw-r--r--doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index 019f208..e21bf75 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.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
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