• con's avatar
    Merge commit 'origin/1.1' · 23d0cb31
    con authored
    Conflicts:
    	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/debugger/Debugger.pluginspec
    	src/plugins/debugger/gdbengine.cpp
    	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/perforce/Perforce.pluginspec
    	src/plugins/projectexplorer/ProjectExplorer.pluginspec
    	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
    	src/plugins/qtscripteditor/QtScriptEditor.pluginspec
    	src/plugins/quickopen/QuickOpen.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
    23d0cb31
projectexplorer.cpp 69.5 KB