Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Showing
- bin/gdbmacros/gdbmacros.cpp 96 additions, 65 deletionsbin/gdbmacros/gdbmacros.cpp
- shared/cplusplus/Keywords.cpp 137 additions, 0 deletionsshared/cplusplus/Keywords.cpp
- shared/cplusplus/Lexer.cpp 7 additions, 2 deletionsshared/cplusplus/Lexer.cpp
- shared/cplusplus/Lexer.h 1 addition, 0 deletionsshared/cplusplus/Lexer.h
- shared/cplusplus/Token.h 13 additions, 1 deletionshared/cplusplus/Token.h
- src/libs/cplusplus/CppDocument.cpp 8 additions, 6 deletionssrc/libs/cplusplus/CppDocument.cpp
- src/libs/cplusplus/CppDocument.h 21 additions, 2 deletionssrc/libs/cplusplus/CppDocument.h
- src/libs/cplusplus/OverviewModel.cpp 5 additions, 7 deletionssrc/libs/cplusplus/OverviewModel.cpp
- src/libs/cplusplus/ResolveExpression.cpp 10 additions, 12 deletionssrc/libs/cplusplus/ResolveExpression.cpp
- src/libs/cplusplus/pp-client.h 2 additions, 1 deletionsrc/libs/cplusplus/pp-client.h
- src/libs/cplusplus/pp-engine.cpp 2 additions, 2 deletionssrc/libs/cplusplus/pp-engine.cpp
- src/libs/cplusplus/pp-environment.cpp 1 addition, 3 deletionssrc/libs/cplusplus/pp-environment.cpp
- src/plugins/bookmarks/bookmarksplugin.cpp 8 additions, 4 deletionssrc/plugins/bookmarks/bookmarksplugin.cpp
- src/plugins/coreplugin/dialogs/settingsdialog.cpp 2 additions, 1 deletionsrc/plugins/coreplugin/dialogs/settingsdialog.cpp
- src/plugins/coreplugin/mainwindow.cpp 9 additions, 0 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/cppeditor/cppeditor.cpp 11 additions, 1 deletionsrc/plugins/cppeditor/cppeditor.cpp
- src/plugins/cpptools/cpphoverhandler.cpp 10 additions, 0 deletionssrc/plugins/cpptools/cpphoverhandler.cpp
- src/plugins/cpptools/cppmodelmanager.cpp 6 additions, 4 deletionssrc/plugins/cpptools/cppmodelmanager.cpp
- src/plugins/debugger/debuggermanager.cpp 0 additions, 1 deletionsrc/plugins/debugger/debuggermanager.cpp
- src/plugins/debugger/gdbengine.cpp 2 additions, 0 deletionssrc/plugins/debugger/gdbengine.cpp
Loading
Please register or sign in to comment