Merge commit 'origin/1.1'
Showing
- bin/qtcreator 1 addition, 1 deletionbin/qtcreator
- dist/changes-1.1.0 2 additions, 2 deletionsdist/changes-1.1.0
- src/libs/extensionsystem/pluginspec.cpp 2 additions, 1 deletionsrc/libs/extensionsystem/pluginspec.cpp
- src/libs/utils/process_stub.pro 2 additions, 0 deletionssrc/libs/utils/process_stub.pro
- src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp 20 additions, 13 deletionssrc/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
- src/plugins/cmakeprojectmanager/cmakeproject.cpp 33 additions, 16 deletionssrc/plugins/cmakeprojectmanager/cmakeproject.cpp
- src/plugins/cmakeprojectmanager/cmakeproject.h 1 addition, 0 deletionssrc/plugins/cmakeprojectmanager/cmakeproject.h
- src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp 8 additions, 5 deletionssrc/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
- src/plugins/cmakeprojectmanager/makestep.cpp 18 additions, 4 deletionssrc/plugins/cmakeprojectmanager/makestep.cpp
- src/plugins/cmakeprojectmanager/makestep.h 2 additions, 0 deletionssrc/plugins/cmakeprojectmanager/makestep.h
- src/plugins/coreplugin/editormanager/editormanager.cpp 3 additions, 0 deletionssrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/coreplugin/mainwindow.cpp 14 additions, 0 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/coreplugin/mainwindow.h 2 additions, 0 deletionssrc/plugins/coreplugin/mainwindow.h
- src/plugins/coreplugin/welcomemode.cpp 7 additions, 4 deletionssrc/plugins/coreplugin/welcomemode.cpp
- src/plugins/coreplugin/welcomemode.h 2 additions, 1 deletionsrc/plugins/coreplugin/welcomemode.h
- src/plugins/cppeditor/cppeditor.cpp 2 additions, 2 deletionssrc/plugins/cppeditor/cppeditor.cpp
- src/plugins/cpptools/cppcodecompletion.cpp 14 additions, 6 deletionssrc/plugins/cpptools/cppcodecompletion.cpp
- src/plugins/cpptools/cppcodecompletion.h 1 addition, 1 deletionsrc/plugins/cpptools/cppcodecompletion.h
- src/plugins/debugger/debuggeractions.cpp 13 additions, 13 deletionssrc/plugins/debugger/debuggeractions.cpp
- src/plugins/debugger/debuggeractions.h 5 additions, 5 deletionssrc/plugins/debugger/debuggeractions.h
Loading
Please register or sign in to comment