summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-11 23:09:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-11 23:09:13 (GMT)
commit4c19b74c46dabb98d14a5c7cd51b7224ede91321 (patch)
treea88db4e400c443e618e476b7e13f646057555a0f
parent2f1e44e42f9ac399ed5c3625df5316073317b0e9 (diff)
parent1d958d22de979c90e4b41b32152cce6d29abb46f (diff)
downloadQt-4c19b74c46dabb98d14a5c7cd51b7224ede91321.zip
Qt-4c19b74c46dabb98d14a5c7cd51b7224ede91321.tar.gz
Qt-4c19b74c46dabb98d14a5c7cd51b7224ede91321.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Doc: fix typo
-rw-r--r--doc/src/deployment/deployment.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 47219bf..a359787 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -746,7 +746,7 @@
If the shared library has dependencies that are different from the
application using it, the manifest file needs to be embedded into the DLL
- binary. Since Qt 4.1.3, the follwoing \c CONFIG options are available for
+ binary. Since Qt 4.1.3, the following \c CONFIG options are available for
embedding manifests:
\snippet doc/src/snippets/code/doc_src_deployment.qdoc 20