Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- doc/doc.pri 1 addition, 1 deletiondoc/doc.pri
- shared/cplusplus/Parser.cpp 1 addition, 0 deletionsshared/cplusplus/Parser.cpp
- src/libs/cplusplus/ResolveExpression.cpp 6 additions, 0 deletionssrc/libs/cplusplus/ResolveExpression.cpp
- src/libs/cplusplus/ResolveExpression.h 1 addition, 0 deletionssrc/libs/cplusplus/ResolveExpression.h
- src/plugins/coreplugin/dialogs/ioptionspage.h 2 additions, 1 deletionsrc/plugins/coreplugin/dialogs/ioptionspage.h
- src/plugins/coreplugin/dialogs/settingsdialog.cpp 6 additions, 4 deletionssrc/plugins/coreplugin/dialogs/settingsdialog.cpp
- src/plugins/coreplugin/dialogs/shortcutsettings.cpp 6 additions, 6 deletionssrc/plugins/coreplugin/dialogs/shortcutsettings.cpp
- src/plugins/coreplugin/dialogs/shortcutsettings.h 2 additions, 1 deletionsrc/plugins/coreplugin/dialogs/shortcutsettings.h
- src/plugins/coreplugin/generalsettings.cpp 1 addition, 4 deletionssrc/plugins/coreplugin/generalsettings.cpp
- src/plugins/coreplugin/generalsettings.h 2 additions, 1 deletionsrc/plugins/coreplugin/generalsettings.h
- src/plugins/cpaster/settingspage.cpp 1 addition, 4 deletionssrc/plugins/cpaster/settingspage.cpp
- src/plugins/cpaster/settingspage.h 2 additions, 1 deletionsrc/plugins/cpaster/settingspage.h
- src/plugins/cpptools/completionsettingspage.cpp 1 addition, 4 deletionssrc/plugins/cpptools/completionsettingspage.cpp
- src/plugins/cpptools/completionsettingspage.h 2 additions, 1 deletionsrc/plugins/cpptools/completionsettingspage.h
- src/plugins/debugger/gdboptionpage.cpp 1 addition, 4 deletionssrc/plugins/debugger/gdboptionpage.cpp
- src/plugins/debugger/gdboptionpage.h 2 additions, 1 deletionsrc/plugins/debugger/gdboptionpage.h
- src/plugins/designer/settingspage.cpp 11 additions, 3 deletionssrc/plugins/designer/settingspage.cpp
- src/plugins/designer/settingspage.h 3 additions, 1 deletionsrc/plugins/designer/settingspage.h
- src/plugins/git/settingspage.cpp 2 additions, 3 deletionssrc/plugins/git/settingspage.cpp
- src/plugins/git/settingspage.h 2 additions, 1 deletionsrc/plugins/git/settingspage.h
Loading
Please register or sign in to comment