Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- src/plugins/coreplugin/actionmanager/actioncontainer.cpp 4 additions, 7 deletionssrc/plugins/coreplugin/actionmanager/actioncontainer.cpp
- src/plugins/coreplugin/actionmanager/actionmanager.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/actionmanager/actionmanager.cpp
- src/plugins/coreplugin/actionmanager/actionmanager_p.h 1 addition, 1 deletionsrc/plugins/coreplugin/actionmanager/actionmanager_p.h
- src/plugins/coreplugin/actionmanager/commandsfile.cpp 2 additions, 3 deletionssrc/plugins/coreplugin/actionmanager/commandsfile.cpp
- src/plugins/coreplugin/dialogs/settingsdialog.cpp 0 additions, 1 deletionsrc/plugins/coreplugin/dialogs/settingsdialog.cpp
- src/plugins/coreplugin/dialogs/shortcutsettings.cpp 14 additions, 30 deletionssrc/plugins/coreplugin/dialogs/shortcutsettings.cpp
- src/plugins/coreplugin/dialogs/shortcutsettings.ui 3 additions, 0 deletionssrc/plugins/coreplugin/dialogs/shortcutsettings.ui
- src/plugins/coreplugin/editmode.cpp 3 additions, 4 deletionssrc/plugins/coreplugin/editmode.cpp
- src/plugins/coreplugin/editormanager/editormanager.cpp 9 additions, 8 deletionssrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/coreplugin/editormanager/openeditorsview.cpp 2 additions, 2 deletionssrc/plugins/coreplugin/editormanager/openeditorsview.cpp
- src/plugins/coreplugin/editormanager/stackededitorgroup.cpp 1 addition, 2 deletionssrc/plugins/coreplugin/editormanager/stackededitorgroup.cpp
- src/plugins/coreplugin/mainwindow.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/coreplugin/modemanager.cpp 0 additions, 1 deletionsrc/plugins/coreplugin/modemanager.cpp
- src/plugins/coreplugin/progressmanager/progressmanager.cpp 2 additions, 3 deletionssrc/plugins/coreplugin/progressmanager/progressmanager.cpp
- src/plugins/coreplugin/uniqueidmanager.h 1 addition, 1 deletionsrc/plugins/coreplugin/uniqueidmanager.h
- src/plugins/coreplugin/versiondialog.cpp 2 additions, 2 deletionssrc/plugins/coreplugin/versiondialog.cpp
- src/plugins/coreplugin/welcomemode.cpp 2 additions, 3 deletionssrc/plugins/coreplugin/welcomemode.cpp
Loading
Please register or sign in to comment