Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- doc/qtcreator.qdoc 68 additions, 2 deletionsdoc/qtcreator.qdoc
- shared/cplusplus/Parser.cpp 3 additions, 0 deletionsshared/cplusplus/Parser.cpp
- shared/scriptwrapper/interface_wrap_helpers.h 0 additions, 1 deletionshared/scriptwrapper/interface_wrap_helpers.h
- src/libs/extensionsystem/ExtensionSystemInterfaces 0 additions, 39 deletionssrc/libs/extensionsystem/ExtensionSystemInterfaces
- src/plugins/bookmarks/bookmarkmanager.cpp 2 additions, 1 deletionsrc/plugins/bookmarks/bookmarkmanager.cpp
- src/plugins/bookmarks/bookmarksplugin.cpp 3 additions, 3 deletionssrc/plugins/bookmarks/bookmarksplugin.cpp
- src/plugins/coreplugin/actionmanager/actioncontainer.cpp 56 additions, 57 deletionssrc/plugins/coreplugin/actionmanager/actioncontainer.cpp
- src/plugins/coreplugin/actionmanager/actioncontainer.h 23 additions, 90 deletionssrc/plugins/coreplugin/actionmanager/actioncontainer.h
- src/plugins/coreplugin/actionmanager/actioncontainer_p.h 142 additions, 0 deletionssrc/plugins/coreplugin/actionmanager/actioncontainer_p.h
- src/plugins/coreplugin/actionmanager/actionmanager.cpp 39 additions, 39 deletionssrc/plugins/coreplugin/actionmanager/actionmanager.cpp
- src/plugins/coreplugin/actionmanager/actionmanager.h 8 additions, 8 deletionssrc/plugins/coreplugin/actionmanager/actionmanager.h
- src/plugins/coreplugin/actionmanager/actionmanager_p.h 15 additions, 15 deletionssrc/plugins/coreplugin/actionmanager/actionmanager_p.h
- src/plugins/coreplugin/actionmanager/command.cpp 39 additions, 101 deletionssrc/plugins/coreplugin/actionmanager/command.cpp
- src/plugins/coreplugin/actionmanager/command.h 34 additions, 119 deletionssrc/plugins/coreplugin/actionmanager/command.h
- src/plugins/coreplugin/actionmanager/command_p.h 179 additions, 0 deletionssrc/plugins/coreplugin/actionmanager/command_p.h
- src/plugins/coreplugin/actionmanager/commandsfile.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/actionmanager/commandsfile.cpp
- src/plugins/coreplugin/baseview.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/baseview.cpp
- src/plugins/coreplugin/coreconstants.h 0 additions, 2 deletionssrc/plugins/coreplugin/coreconstants.h
- src/plugins/coreplugin/coreplugin.pro 4 additions, 4 deletionssrc/plugins/coreplugin/coreplugin.pro
- src/plugins/coreplugin/dialogs/shortcutsettings.cpp 6 additions, 6 deletionssrc/plugins/coreplugin/dialogs/shortcutsettings.cpp
Loading
Please register or sign in to comment