Merge branch 'docs'

Conflicts: doc/qtcreator.qdoc

Merge branch 'docs'
Conflicts: doc/qtcreator.qdoc
bd16eeef · Oswald Buddenhagen · 14fc6e93 · 16f7ed26 · 14fc6e93 · bd16eeef
Commit bd16eeef authored Mar 12, 2010 by Oswald Buddenhagen
--- a/doc/images/qtcreator-add-resource-wizard2.png
+++ b/doc/images/qtcreator-add-resource-wizard2.png
--- a/doc/images/qtcreator-add-resource-wizard3.png
+++ b/doc/images/qtcreator-add-resource-wizard3.png
--- a/doc/images/qtcreator-add-resource.png
+++ b/doc/images/qtcreator-add-resource.png
--- a/doc/images/qtcreator-class-info.png
+++ b/doc/images/qtcreator-class-info.png
--- a/doc/images/qtcreator-cmake-import-wizard1.png
+++ b/doc/images/qtcreator-cmake-import-wizard1.png
--- a/doc/images/qtcreator-cmake-import-wizard2.png
+++ b/doc/images/qtcreator-cmake-import-wizard2.png
--- a/doc/images/qtcreator-cmakeexecutable.png
+++ b/doc/images/qtcreator-cmakeexecutable.png
--- a/doc/images/qtcreator-formedit.png
+++ b/doc/images/qtcreator-formedit.png
--- a/doc/images/qtcreator-intro-and-location.png
+++ b/doc/images/qtcreator-intro-and-location.png
--- a/doc/images/qtcreator-new-project-qt-versions.png
+++ b/doc/images/qtcreator-new-project-qt-versions.png
--- a/doc/images/qtcreator-new-project-summary.png
+++ b/doc/images/qtcreator-new-project-summary.png
--- a/doc/images/qtcreator-new-project.png
+++ b/doc/images/qtcreator-new-project.png
--- a/doc/images/qtcreator-run.png
+++ b/doc/images/qtcreator-run.png
--- a/doc/images/qtcreator-search-allprojects.png
+++ b/doc/images/qtcreator-search-allprojects.png
--- a/doc/images/qtcreator-serverbutton.png
+++ b/doc/images/qtcreator-serverbutton.png
--- a/doc/images/qtcreator-texfinder-ui-horizontal-layout.png
+++ b/doc/images/qtcreator-texfinder-ui-horizontal-layout.png
--- a/doc/images/qtcreator-texteditor-behavior.png
+++ b/doc/images/qtcreator-texteditor-behavior.png
--- a/doc/images/qtcreator-texteditor-completion.png
+++ b/doc/images/qtcreator-texteditor-completion.png
--- a/doc/images/qtcreator-texteditor-display.png
+++ b/doc/images/qtcreator-texteditor-display.png
--- a/doc/images/qtcreator-texteditor-fonts.png
+++ b/doc/images/qtcreator-texteditor-fonts.png