diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 16:16:18 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 16:16:18 (GMT) |
| commit | fe1a44a850e61d8b64626424b45ef7592ec66589 (patch) | |
| tree | 5cceb6849ddebd37f3098664c52bdb629543cca1 /doc/src/declarative/declarativeui.qdoc | |
| parent | ef01812875f0dfc8e032fefb90f1afeb57aaa821 (diff) | |
| parent | 2181a341839b72a627a7ef641de58d1d2411f123 (diff) | |
| download | Qt-fe1a44a850e61d8b64626424b45ef7592ec66589.zip Qt-fe1a44a850e61d8b64626424b45ef7592ec66589.tar.gz Qt-fe1a44a850e61d8b64626424b45ef7592ec66589.tar.bz2 | |
Merge branch 'master' of git:qt/qt
Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/advtutorial2.qdoc
doc/src/declarative/advtutorial3.qdoc
doc/src/declarative/advtutorial4.qdoc
doc/src/declarative/tutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
Diffstat (limited to 'doc/src/declarative/declarativeui.qdoc')
| -rw-r--r-- | doc/src/declarative/declarativeui.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index c57b73e..1129f00 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -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 |