Merge branch 'master' of git://scm.dev.nokia.troll.no/creator/mainline into make_install/master
No related branches found
No related tags found
Showing
- doc/coding-style.qdoc 48 additions, 4 deletionsdoc/coding-style.qdoc
- share/qtcreator/gdbmacros/gdbmacros.cpp 110 additions, 130 deletionsshare/qtcreator/gdbmacros/gdbmacros.cpp
- src/plugins/bineditor/bineditorplugin.cpp 10 additions, 21 deletionssrc/plugins/bineditor/bineditorplugin.cpp
- src/plugins/bineditor/bineditorplugin.h 1 addition, 6 deletionssrc/plugins/bineditor/bineditorplugin.h
- src/plugins/bookmarks/bookmarkmanager.cpp 3 additions, 4 deletionssrc/plugins/bookmarks/bookmarkmanager.cpp
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp 3 additions, 4 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
- 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, 4 deletionssrc/plugins/coreplugin/actionmanager/commandsfile.cpp
- src/plugins/coreplugin/basefilewizard.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/basefilewizard.cpp
- src/plugins/coreplugin/coreplugin.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/coreplugin.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 11 additions, 12 deletionssrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/coreplugin/editormanager/openeditorsview.cpp 3 additions, 4 deletionssrc/plugins/coreplugin/editormanager/openeditorsview.cpp
- src/plugins/coreplugin/editormanager/stackededitorgroup.cpp 1 addition, 2 deletionssrc/plugins/coreplugin/editormanager/stackededitorgroup.cpp
- src/plugins/coreplugin/filemanager.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/filemanager.cpp
Loading
Please register or sign in to comment