diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-09 00:20:31 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-09 00:20:31 (GMT) |
| commit | 411404e5126936d691d5bb2b77d1754902fab5e0 (patch) | |
| tree | 41d046c9029a2d58947c3855de672af2b8b18a7a /doc/src/deployment/qt-conf.qdoc | |
| parent | 04664c6ed9a86d146c91ef57990d8ffdf3afa59d (diff) | |
| parent | bb07e7d2f4f3e8940ebcc12334b4b723e450d374 (diff) | |
| download | Qt-411404e5126936d691d5bb2b77d1754902fab5e0.zip Qt-411404e5126936d691d5bb2b77d1754902fab5e0.tar.gz Qt-411404e5126936d691d5bb2b77d1754902fab5e0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src/deployment/qt-conf.qdoc')
| -rw-r--r-- | doc/src/deployment/qt-conf.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc index b195889..298f539 100644 --- a/doc/src/deployment/qt-conf.qdoc +++ b/doc/src/deployment/qt-conf.qdoc @@ -87,6 +87,7 @@ \row \o Libraries \o \c lib \row \o Binaries \o \c bin \row \o Plugins \o \c plugins + \row \o Imports \o \c imports \row \o Data \o \c . \row \o Translations \o \c translations \row \o Settings \o \c . |