Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- dist/changes-1.2.1 28 additions, 0 deletionsdist/changes-1.2.1
- doc/examples/addressbook-sdk/part7/addressbook.cpp 316 additions, 0 deletionsdoc/examples/addressbook-sdk/part7/addressbook.cpp
- doc/examples/addressbook-sdk/part7/addressbook.h 38 additions, 0 deletionsdoc/examples/addressbook-sdk/part7/addressbook.h
- doc/examples/addressbook-sdk/part7/addressbook.ui 131 additions, 5 deletionsdoc/examples/addressbook-sdk/part7/addressbook.ui
- doc/examples/addressbook-sdk/part7/part7.pro 9 additions, 13 deletionsdoc/examples/addressbook-sdk/part7/part7.pro
- src/libs/cplusplus/CppBindings.cpp 230 additions, 27 deletionssrc/libs/cplusplus/CppBindings.cpp
- src/libs/cplusplus/CppBindings.h 20 additions, 5 deletionssrc/libs/cplusplus/CppBindings.h
- src/libs/cplusplus/ResolveExpression.cpp 28 additions, 3 deletionssrc/libs/cplusplus/ResolveExpression.cpp
- src/libs/cplusplus/pp-engine.cpp 1 addition, 1 deletionsrc/libs/cplusplus/pp-engine.cpp
- src/plugins/cppeditor/cpphighlighter.cpp 1 addition, 1 deletionsrc/plugins/cppeditor/cpphighlighter.cpp
- src/plugins/debugger/cdb/cdbstackframecontext.cpp 0 additions, 354 deletionssrc/plugins/debugger/cdb/cdbstackframecontext.cpp
- src/shared/cplusplus/Lexer.cpp 2 additions, 2 deletionssrc/shared/cplusplus/Lexer.cpp
- src/shared/cplusplus/Literals.cpp 97 additions, 3 deletionssrc/shared/cplusplus/Literals.cpp
- src/shared/cplusplus/Literals.h 23 additions, 0 deletionssrc/shared/cplusplus/Literals.h
- src/shared/cplusplus/Parser.cpp 5 additions, 5 deletionssrc/shared/cplusplus/Parser.cpp
- src/shared/cplusplus/Token.cpp 1 addition, 2 deletionssrc/shared/cplusplus/Token.cpp
- src/shared/cplusplus/Token.h 1 addition, 2 deletionssrc/shared/cplusplus/Token.h
- src/shared/cplusplus/TranslationUnit.cpp 1 addition, 1 deletionsrc/shared/cplusplus/TranslationUnit.cpp
Loading
Please register or sign in to comment