Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
Conflicts: src/plugins/coreplugin/outputpane.h
Showing
- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp 8 additions, 0 deletionssrc/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h 1 addition, 0 deletionssrc/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
- src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp 3 additions, 0 deletions...ugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp
- src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp 15 additions, 0 deletionssrc/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
- src/plugins/cmakeprojectmanager/cmakerunconfiguration.h 2 additions, 0 deletionssrc/plugins/cmakeprojectmanager/cmakerunconfiguration.h
- src/plugins/coreplugin/actionmanager/command.cpp 10 additions, 1 deletionsrc/plugins/coreplugin/actionmanager/command.cpp
- src/plugins/coreplugin/actionmanager/command_p.h 1 addition, 0 deletionssrc/plugins/coreplugin/actionmanager/command_p.h
- src/plugins/coreplugin/editmode.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/editmode.cpp
- src/plugins/coreplugin/outputpane.cpp 65 additions, 1 deletionsrc/plugins/coreplugin/outputpane.cpp
- src/plugins/coreplugin/outputpane.h 9 additions, 1 deletionsrc/plugins/coreplugin/outputpane.h
- src/plugins/cvs/cvsplugin.cpp 15 additions, 20 deletionssrc/plugins/cvs/cvsplugin.cpp
- src/plugins/cvs/cvssettings.cpp 8 additions, 1 deletionsrc/plugins/cvs/cvssettings.cpp
- src/plugins/cvs/cvssettings.h 4 additions, 0 deletionssrc/plugins/cvs/cvssettings.h
- src/plugins/cvs/settingspage.cpp 2 additions, 0 deletionssrc/plugins/cvs/settingspage.cpp
- src/plugins/cvs/settingspage.ui 32 additions, 4 deletionssrc/plugins/cvs/settingspage.ui
- src/plugins/debugger/debuggerplugin.cpp 1 addition, 1 deletionsrc/plugins/debugger/debuggerplugin.cpp
- src/plugins/debugger/gdb/gdbengine.cpp 4 additions, 2 deletionssrc/plugins/debugger/gdb/gdbengine.cpp
- src/plugins/git/settingspage.ui 4 additions, 1 deletionsrc/plugins/git/settingspage.ui
- src/plugins/perforce/perforceplugin.cpp 2 additions, 5 deletionssrc/plugins/perforce/perforceplugin.cpp
- src/plugins/perforce/perforcesettings.cpp 7 additions, 1 deletionsrc/plugins/perforce/perforcesettings.cpp
Loading
Please register or sign in to comment