diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 01:23:03 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 01:23:03 (GMT) |
| commit | 10ee284f7722c2479e85d469b179c9311b10238a (patch) | |
| tree | f763d60087111ed6210812b3d028a07513807996 /doc/src/getting-started | |
| parent | 1ec06a42b2b18b850b5ede133d1c23a00e6dbe21 (diff) | |
| parent | f95e0d4dee769363a9c84b27f854055b0425e6ec (diff) | |
| download | Qt-10ee284f7722c2479e85d469b179c9311b10238a.zip Qt-10ee284f7722c2479e85d469b179c9311b10238a.tar.gz Qt-10ee284f7722c2479e85d469b179c9311b10238a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/qml/qml.h
Diffstat (limited to 'doc/src/getting-started')
| -rw-r--r-- | doc/src/getting-started/installation.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index e54774b..b23629d 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -176,7 +176,7 @@ consult the installation instructions provided instead of the ones in this document. \o \l{Open Source Versions of Qt} is not officially supported for use with any version of Visual Studio. Integration with Visual Studio is available -as part of the \l{Qt Commercial Editions}. +as part of the \l{Qt Commercial Edition}. \endlist \endtable |