Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- dist/changes-1.1.1 7 additions, 0 deletionsdist/changes-1.1.1
- src/libs/utils/qstringbuilder.h 18 additions, 7 deletionssrc/libs/utils/qstringbuilder.h
- src/plugins/bineditor/bineditorplugin.cpp 2 additions, 0 deletionssrc/plugins/bineditor/bineditorplugin.cpp
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp 1 addition, 1 deletionsrc/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
- src/plugins/coreplugin/coreimpl.cpp 5 additions, 0 deletionssrc/plugins/coreplugin/coreimpl.cpp
- src/plugins/coreplugin/coreimpl.h 1 addition, 0 deletionssrc/plugins/coreplugin/coreimpl.h
- src/plugins/coreplugin/coreplugin.pro 6 additions, 3 deletionssrc/plugins/coreplugin/coreplugin.pro
- src/plugins/coreplugin/editormanager/editormanager.cpp 35 additions, 16 deletionssrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/coreplugin/editormanager/editormanager.h 2 additions, 2 deletionssrc/plugins/coreplugin/editormanager/editormanager.h
- src/plugins/coreplugin/editormanager/ieditor.h 2 additions, 0 deletionssrc/plugins/coreplugin/editormanager/ieditor.h
- src/plugins/coreplugin/icore.cpp 17 additions, 4 deletionssrc/plugins/coreplugin/icore.cpp
- src/plugins/coreplugin/icore.h 2 additions, 0 deletionssrc/plugins/coreplugin/icore.h
- src/plugins/coreplugin/mainwindow.cpp 9 additions, 4 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/coreplugin/mainwindow.h 3 additions, 0 deletionssrc/plugins/coreplugin/mainwindow.h
- src/plugins/coreplugin/settingsdatabase.cpp 239 additions, 0 deletionssrc/plugins/coreplugin/settingsdatabase.cpp
- src/plugins/coreplugin/settingsdatabase.h 70 additions, 0 deletionssrc/plugins/coreplugin/settingsdatabase.h
- src/plugins/cppeditor/cppeditor.h 2 additions, 0 deletionssrc/plugins/cppeditor/cppeditor.h
- src/plugins/cppeditor/cppplugin.cpp 2 additions, 2 deletionssrc/plugins/cppeditor/cppplugin.cpp
- src/plugins/debugger/debuggermanager.cpp 46 additions, 26 deletionssrc/plugins/debugger/debuggermanager.cpp
- src/plugins/debugger/debuggermanager.h 6 additions, 2 deletionssrc/plugins/debugger/debuggermanager.h
Loading
Please register or sign in to comment