diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-16 14:39:29 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-16 14:39:29 +0200 |
| commit | b11d8d673ba36ab22c0d7a40ea53d57f284cca13 (patch) | |
| tree | f370841deac0b5516fa458a910f508d592a6cc36 /doc | |
| parent | 478ec8819427f783cba05601779cfce9dba1d55c (diff) | |
| parent | a16f81a365b7d9a6629b04bd298a3b45fc1b7628 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia02497aafc94feba0381ffe8733cbc89f29fb412
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/qtsensors.qdocconf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/config/qtsensors.qdocconf b/doc/config/qtsensors.qdocconf index 44e5807a..2fbeea03 100644 --- a/doc/config/qtsensors.qdocconf +++ b/doc/config/qtsensors.qdocconf @@ -1,4 +1,3 @@ -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) #include(compat.qdocconf) |