Commit 7f733b15 authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0'

Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
parents 310194cb 4b2bbfe6
doc/images/qt-simulator.png

159 KB | W: | H:

doc/images/qt-simulator.png

231 KB | W: | H:

doc/images/qt-simulator.png
doc/images/qt-simulator.png
doc/images/qt-simulator.png
doc/images/qt-simulator.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-debugger-views.png

23.1 KB | W: | H:

doc/images/qtcreator-debugger-views.png

36.8 KB | W: | H:

doc/images/qtcreator-debugger-views.png
doc/images/qtcreator-debugger-views.png
doc/images/qtcreator-debugger-views.png
doc/images/qtcreator-debugger-views.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-locator-open.png

10.5 KB | W: | H:

doc/images/qtcreator-locator-open.png

14.2 KB | W: | H:

doc/images/qtcreator-locator-open.png
doc/images/qtcreator-locator-open.png
doc/images/qtcreator-locator-open.png
doc/images/qtcreator-locator-open.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-locator.png

18.1 KB | W: | H:

doc/images/qtcreator-locator.png

32.5 KB | W: | H:

doc/images/qtcreator-locator.png
doc/images/qtcreator-locator.png
doc/images/qtcreator-locator.png
doc/images/qtcreator-locator.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-navigate-popup.png

86.7 KB | W: | H:

doc/images/qtcreator-navigate-popup.png

63.8 KB | W: | H:

doc/images/qtcreator-navigate-popup.png
doc/images/qtcreator-navigate-popup.png
doc/images/qtcreator-navigate-popup.png
doc/images/qtcreator-navigate-popup.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-new-project.png

26.8 KB | W: | H:

doc/images/qtcreator-new-project.png

27.6 KB | W: | H:

doc/images/qtcreator-new-project.png
doc/images/qtcreator-new-project.png
doc/images/qtcreator-new-project.png
doc/images/qtcreator-new-project.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-projectpane.png

89 KB | W: | H:

doc/images/qtcreator-projectpane.png

71.1 KB | W: | H:

doc/images/qtcreator-projectpane.png
doc/images/qtcreator-projectpane.png
doc/images/qtcreator-projectpane.png
doc/images/qtcreator-projectpane.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment