diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-05 06:04:05 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-05 06:04:05 (GMT) |
| commit | 03a6b8a393aa94203b872a806d04f331d6162603 (patch) | |
| tree | 384c6e2ce821b80c1501f63d9dea8c39ca7b837a /doc | |
| parent | 2babb8240b03a05133c8c7906252bce255739c33 (diff) | |
| parent | 186a38c683cbec6a2a141245d5e428d85c073b8f (diff) | |
| download | Qt-03a6b8a393aa94203b872a806d04f331d6162603.zip Qt-03a6b8a393aa94203b872a806d04f331d6162603.tar.gz Qt-03a6b8a393aa94203b872a806d04f331d6162603.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index fb1d0e4..a90544f 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -549,7 +549,7 @@ the state machine, it is also easier to use the framework for animating GUIs, for instance. - See \l{The State Machine Framework} documentation for more infromation. + See \l{The State Machine Framework} documentation for more information. \section1 Multi-Touch and Gestures |