diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-05 01:58:29 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-05 01:58:29 (GMT) |
| commit | 56d5cac2f2bbee9e4e1ee6ac6ac9670926bb329f (patch) | |
| tree | 4533403537769121558dec29414ffcedb1103abc /doc/src | |
| parent | 186cdd1c29f1c708455ec2f0771a6eb600d4a075 (diff) | |
| parent | 4c486619517cea4012a157995bce197c817d83e5 (diff) | |
| download | Qt-56d5cac2f2bbee9e4e1ee6ac6ac9670926bb329f.zip Qt-56d5cac2f2bbee9e4e1ee6ac6ac9670926bb329f.tar.gz Qt-56d5cac2f2bbee9e4e1ee6ac6ac9670926bb329f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'doc/src')
| -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 |