diff options
| author | con <qtc-committer@nokia.com> | 2010-07-13 11:31:05 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-07-13 11:31:05 +0200 |
| commit | d24d01f49c92cc45f7473ded912a5fef2e068e99 (patch) | |
| tree | 4d88e73d69926dd9d3e87af038dc396b39170ed9 /doc/qtcreator.qdocconf | |
| parent | f823c4810e3f544df2440db0c0e1966b6f197f4b (diff) | |
| parent | 52b9fcca2ddd5d5e95c6e13cbded018699c7dd68 (diff) | |
| download | qt-creator-d24d01f49c92cc45f7473ded912a5fef2e068e99.tar.gz | |
Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0)
Conflicts:
src/plugins/debugger/debuggeragents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
Diffstat (limited to 'doc/qtcreator.qdocconf')
| -rw-r--r-- | doc/qtcreator.qdocconf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 876ceb9248..4396355716 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -55,7 +55,8 @@ qhp.QtCreator.extraFiles = \ images/page_bg.png \ images/page.png \ images/qt-logo.png \ - images/sprites-combined.png + images/sprites-combined.png \ + images/bullet_up.png qhp.QtCreator.subprojects = manual qhp.QtCreator.subprojects.manual.title = Qt Creator Manual |