Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- src/plugins/cmakeprojectmanager/cmakeconfigurewidget.cpp 0 additions, 119 deletionssrc/plugins/cmakeprojectmanager/cmakeconfigurewidget.cpp
- src/plugins/cmakeprojectmanager/cmakeconfigurewidget.h 0 additions, 77 deletionssrc/plugins/cmakeprojectmanager/cmakeconfigurewidget.h
- src/plugins/cmakeprojectmanager/cmakeconfigurewidget.ui 0 additions, 95 deletionssrc/plugins/cmakeprojectmanager/cmakeconfigurewidget.ui
- src/plugins/cmakeprojectmanager/cmakeproject.cpp 18 additions, 41 deletionssrc/plugins/cmakeprojectmanager/cmakeproject.cpp
- src/plugins/cmakeprojectmanager/cmakeproject.h 0 additions, 3 deletionssrc/plugins/cmakeprojectmanager/cmakeproject.h
- src/plugins/cmakeprojectmanager/cmakeprojectconstants.h 0 additions, 1 deletionsrc/plugins/cmakeprojectmanager/cmakeprojectconstants.h
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp 20 additions, 11 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.h 4 additions, 1 deletionsrc/plugins/cmakeprojectmanager/cmakeprojectmanager.h
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro 3 additions, 5 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
- src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp 0 additions, 2 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
- src/plugins/cmakeprojectmanager/cmakestep.cpp 0 additions, 170 deletionssrc/plugins/cmakeprojectmanager/cmakestep.cpp
- src/plugins/cmakeprojectmanager/cmakestep.h 0 additions, 94 deletionssrc/plugins/cmakeprojectmanager/cmakestep.h
- src/plugins/coreplugin/mainwindow.cpp 18 additions, 9 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/debugger/debugger.pro 1 addition, 1 deletionsrc/plugins/debugger/debugger.pro
- src/plugins/projectexplorer/toolchain.cpp 1 addition, 1 deletionsrc/plugins/projectexplorer/toolchain.cpp
- src/shared/proparser/profileevaluator.cpp 36 additions, 18 deletionssrc/shared/proparser/profileevaluator.cpp
Loading
Please register or sign in to comment