Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp 1 addition, 75 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
- src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp 4 additions, 1 deletionsrc/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
- src/plugins/coreplugin/editormanager/editormanager.cpp 3 additions, 1 deletionsrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/find/findtoolwindow.cpp 1 addition, 1 deletionsrc/plugins/find/findtoolwindow.cpp
- src/plugins/projectexplorer/debugginghelper.cpp 223 additions, 0 deletionssrc/plugins/projectexplorer/debugginghelper.cpp
- src/plugins/projectexplorer/debugginghelper.h 64 additions, 0 deletionssrc/plugins/projectexplorer/debugginghelper.h
- src/plugins/projectexplorer/environment.cpp 1 addition, 1 deletionsrc/plugins/projectexplorer/environment.cpp
- src/plugins/projectexplorer/environment.h 1 addition, 1 deletionsrc/plugins/projectexplorer/environment.h
- src/plugins/projectexplorer/projectexplorer.cpp 1 addition, 13 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/projectexplorer/projectexplorer.h 0 additions, 4 deletionssrc/plugins/projectexplorer/projectexplorer.h
- src/plugins/projectexplorer/projectexplorer.pro 3 additions, 7 deletionssrc/plugins/projectexplorer/projectexplorer.pro
- src/plugins/projectexplorer/projectexplorerconstants.h 0 additions, 5 deletionssrc/plugins/projectexplorer/projectexplorerconstants.h
- src/plugins/qt4projectmanager/makestep.cpp 0 additions, 1 deletionsrc/plugins/qt4projectmanager/makestep.cpp
- src/plugins/qt4projectmanager/makestep.h 2 additions, 3 deletionssrc/plugins/qt4projectmanager/makestep.h
- src/plugins/qt4projectmanager/profilereader.cpp 0 additions, 2 deletionssrc/plugins/qt4projectmanager/profilereader.cpp
- src/plugins/qt4projectmanager/profilereader.h 2 additions, 2 deletionssrc/plugins/qt4projectmanager/profilereader.h
- src/plugins/qt4projectmanager/projectloadwizard.cpp 4 additions, 6 deletionssrc/plugins/qt4projectmanager/projectloadwizard.cpp
- src/plugins/qt4projectmanager/projectloadwizard.h 5 additions, 5 deletionssrc/plugins/qt4projectmanager/projectloadwizard.h
- src/plugins/qt4projectmanager/qmakestep.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qmakestep.cpp
- src/plugins/qt4projectmanager/qt4nodes.cpp 0 additions, 1 deletionsrc/plugins/qt4projectmanager/qt4nodes.cpp
Loading
Please register or sign in to comment