diff options
| author | con <qtc-committer@nokia.com> | 2010-06-24 11:40:22 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-06-24 11:40:22 +0200 |
| commit | af44136e22e1c0a16e526523b4e71dae6d6ca802 (patch) | |
| tree | c229b33791cc9edd28ca6bcf1af8751858762033 /doc/qtcreator.qdocconf | |
| parent | 6cf98e281a570d0f7fb507d853b0e68f98f0f9f2 (diff) | |
| parent | d2944d2250131419e46987b8975a31a41ba8a68c (diff) | |
| download | qt-creator-af44136e22e1c0a16e526523b4e71dae6d6ca802.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/help/helpplugin.cpp
src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/projectexplorer.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
src/tools/qml/qmldump/main.cpp
Diffstat (limited to 'doc/qtcreator.qdocconf')
| -rw-r--r-- | doc/qtcreator.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 7a083f61ce..4e2dc67aad 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -53,6 +53,7 @@ qhp.QtCreator.extraFiles = \ images/feedbackground.png \ images/horBar.png \ images/page_bg.png \ + images/page.png \ images/qt-logo.png \ images/sprites-combined.png |