Merge branch 'master' of ../mainline into dui-editor
Showing
- src/plugins/coreplugin/welcomemode.ui 6 additions, 0 deletionssrc/plugins/coreplugin/welcomemode.ui
- src/plugins/cpptools/cppfilesettingspage.cpp 12 additions, 12 deletionssrc/plugins/cpptools/cppfilesettingspage.cpp
- src/plugins/cpptools/cppfilesettingspage.h 6 additions, 3 deletionssrc/plugins/cpptools/cppfilesettingspage.h
- src/plugins/cpptools/cpptoolsplugin.cpp 10 additions, 3 deletionssrc/plugins/cpptools/cpptoolsplugin.cpp
- src/plugins/cpptools/cpptoolsplugin.h 4 additions, 1 deletionsrc/plugins/cpptools/cpptoolsplugin.h
Loading
Please register or sign in to comment