Merge branch 'master' of ../mainline into genericprojectmanager
No related branches found
No related tags found
Showing
- doc/doc.pri 5 additions, 1 deletiondoc/doc.pri
- src/plugins/cmakeprojectmanager/cmakeproject.cpp 3 additions, 1 deletionsrc/plugins/cmakeprojectmanager/cmakeproject.cpp
- src/plugins/cmakeprojectmanager/cmakeprojectnodes.h 2 additions, 4 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectnodes.h
- src/plugins/coreplugin/html/qt.css 12 additions, 12 deletionssrc/plugins/coreplugin/html/qt.css
- src/plugins/coreplugin/html/welcome.html 1 addition, 3 deletionssrc/plugins/coreplugin/html/welcome.html
- src/plugins/coreplugin/icontext.h 19 additions, 0 deletionssrc/plugins/coreplugin/icontext.h
- src/plugins/help/helpplugin.cpp 16 additions, 0 deletionssrc/plugins/help/helpplugin.cpp
- src/plugins/help/helpplugin.h 5 additions, 4 deletionssrc/plugins/help/helpplugin.h
- src/plugins/projectexplorer/projectnodes.cpp 37 additions, 5 deletionssrc/plugins/projectexplorer/projectnodes.cpp
Loading
Please register or sign in to comment