diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 07:38:52 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 07:39:36 (GMT) |
| commit | 0e10b8dbb7d84694cbdeb57bf42df52b12d79f47 (patch) | |
| tree | e0968185c3afce109537977c9eb0df4cfd8f6cb7 /doc/src/index.qdoc | |
| parent | ac51ebee5bcc975829cf59012dfe9bb198016ed1 (diff) | |
| parent | 5a9000c3aca05e28c4fc537f82d85d6ec4395dc5 (diff) | |
| download | Qt-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.zip Qt-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.tar.gz Qt-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
Diffstat (limited to 'doc/src/index.qdoc')
| -rw-r--r-- | doc/src/index.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 2490374..9680aa2 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -40,7 +40,7 @@ \o \l{How to Learn Qt} \o \l{Introduction to Qt Quick}{Qt Quick} \o \l{Qt Whitepaper}{Qt C++ Framework} - \o \l{Intro to Qt Quick}{Qt Quick} + \o \l{Introduction to Qt Quick}{Qt Quick} \o \l{external: Qt Mobility Manual}{Qt Mobility} \o \l{Qt WebKit} \endlist |