Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- src/plugins/coreplugin/fileiconprovider.cpp 3 additions, 3 deletionssrc/plugins/coreplugin/fileiconprovider.cpp
- src/plugins/coreplugin/manhattanstyle.cpp 8 additions, 0 deletionssrc/plugins/coreplugin/manhattanstyle.cpp
- src/plugins/coreplugin/manhattanstyle.h 3 additions, 0 deletionssrc/plugins/coreplugin/manhattanstyle.h
- src/plugins/debugger/watchwindow.cpp 2 additions, 2 deletionssrc/plugins/debugger/watchwindow.cpp
- src/plugins/find/findtoolbar.cpp 11 additions, 0 deletionssrc/plugins/find/findtoolbar.cpp
- src/plugins/find/findtoolbar.h 2 additions, 0 deletionssrc/plugins/find/findtoolbar.h
- src/plugins/git/settingspage.ui 28 additions, 24 deletionssrc/plugins/git/settingspage.ui
- src/plugins/help/centralwidget.cpp 0 additions, 50 deletionssrc/plugins/help/centralwidget.cpp
- src/plugins/help/centralwidget.h 1 addition, 2 deletionssrc/plugins/help/centralwidget.h
- src/plugins/projectexplorer/customexecutablerunconfiguration.cpp 17 additions, 55 deletions...gins/projectexplorer/customexecutablerunconfiguration.cpp
- src/plugins/projectexplorer/customexecutablerunconfiguration.h 6 additions, 6 deletions...lugins/projectexplorer/customexecutablerunconfiguration.h
- src/plugins/projectexplorer/processstep.cpp 9 additions, 30 deletionssrc/plugins/projectexplorer/processstep.cpp
- src/plugins/projectexplorer/processstep.h 0 additions, 2 deletionssrc/plugins/projectexplorer/processstep.h
- src/plugins/projectexplorer/processstep.ui 28 additions, 32 deletionssrc/plugins/projectexplorer/processstep.ui
- src/plugins/qt4projectmanager/qt4buildconfigwidget.ui 4 additions, 4 deletionssrc/plugins/qt4projectmanager/qt4buildconfigwidget.ui
- src/plugins/quickopen/quickopentoolwindow.cpp 0 additions, 2 deletionssrc/plugins/quickopen/quickopentoolwindow.cpp
- src/plugins/texteditor/behaviorsettingspage.ui 2 additions, 2 deletionssrc/plugins/texteditor/behaviorsettingspage.ui
- src/shared/cplusplus/Parser.cpp 2 additions, 1 deletionsrc/shared/cplusplus/Parser.cpp
- src/shared/qrceditor/qrceditor.cpp 5 additions, 0 deletionssrc/shared/qrceditor/qrceditor.cpp
- src/shared/qrceditor/resourcefile.cpp 13 additions, 25 deletionssrc/shared/qrceditor/resourcefile.cpp
Loading
Please register or sign in to comment