Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- doc/qtcreator.qdoc 1 addition, 1 deletiondoc/qtcreator.qdoc
- doc/qtcreator.qdocconf 5 additions, 5 deletionsdoc/qtcreator.qdocconf
- replaceVersion.sh 32 additions, 3 deletionsreplaceVersion.sh
- src/plugins/cmakeprojectmanager/cmakeconfigurewidget.cpp 90 additions, 0 deletionssrc/plugins/cmakeprojectmanager/cmakeconfigurewidget.cpp
- src/plugins/cmakeprojectmanager/cmakeconfigurewidget.h 48 additions, 0 deletionssrc/plugins/cmakeprojectmanager/cmakeconfigurewidget.h
- src/plugins/cmakeprojectmanager/cmakeproject.cpp 30 additions, 29 deletionssrc/plugins/cmakeprojectmanager/cmakeproject.cpp
- src/plugins/cmakeprojectmanager/cmakeproject.h 1 addition, 2 deletionssrc/plugins/cmakeprojectmanager/cmakeproject.h
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp 222 additions, 1 deletionsrc/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.h 58 additions, 3 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.h
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro 5 additions, 2 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
- src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp 3 additions, 1 deletionsrc/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
- src/plugins/cmakeprojectmanager/cmakestep.cpp 11 additions, 7 deletionssrc/plugins/cmakeprojectmanager/cmakestep.cpp
- src/plugins/cmakeprojectmanager/cmakestep.h 2 additions, 2 deletionssrc/plugins/cmakeprojectmanager/cmakestep.h
- src/plugins/projectexplorer/environment.cpp 0 additions, 4 deletionssrc/plugins/projectexplorer/environment.cpp
- src/plugins/projectexplorer/runsettingspropertiespage.ui 2 additions, 2 deletionssrc/plugins/projectexplorer/runsettingspropertiespage.ui
Loading
Please register or sign in to comment