Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts: src/plugins/debugger/gdbengine.cpp
No related branches found
No related tags found
Showing
- src/libs/cplusplus/Icons.cpp 1 addition, 1 deletionsrc/libs/cplusplus/Icons.cpp
- src/libs/cplusplus/Overview.cpp 12 additions, 1 deletionsrc/libs/cplusplus/Overview.cpp
- src/libs/cplusplus/Overview.h 4 additions, 0 deletionssrc/libs/cplusplus/Overview.h
- src/libs/cplusplus/TypePrettyPrinter.cpp 48 additions, 3 deletionssrc/libs/cplusplus/TypePrettyPrinter.cpp
- src/plugins/cppeditor/cpphoverhandler.cpp 107 additions, 43 deletionssrc/plugins/cppeditor/cpphoverhandler.cpp
- src/plugins/debugger/gdbengine.cpp 1 addition, 2 deletionssrc/plugins/debugger/gdbengine.cpp
- src/shared/cplusplus/AST.cpp 1 addition, 1 deletionsrc/shared/cplusplus/AST.cpp
- src/shared/cplusplus/CPlusPlusForwardDeclarations.h 1 addition, 0 deletionssrc/shared/cplusplus/CPlusPlusForwardDeclarations.h
- src/shared/cplusplus/CheckDeclaration.cpp 17 additions, 0 deletionssrc/shared/cplusplus/CheckDeclaration.cpp
- src/shared/cplusplus/Control.cpp 15 additions, 0 deletionssrc/shared/cplusplus/Control.cpp
- src/shared/cplusplus/Control.h 3 additions, 0 deletionssrc/shared/cplusplus/Control.h
- src/shared/cplusplus/Symbol.cpp 3 additions, 0 deletionssrc/shared/cplusplus/Symbol.cpp
- src/shared/cplusplus/Symbol.h 5 additions, 0 deletionssrc/shared/cplusplus/Symbol.h
- src/shared/cplusplus/SymbolVisitor.h 1 addition, 0 deletionssrc/shared/cplusplus/SymbolVisitor.h
- src/shared/cplusplus/Symbols.cpp 47 additions, 0 deletionssrc/shared/cplusplus/Symbols.cpp
- src/shared/cplusplus/Symbols.h 36 additions, 1 deletionsrc/shared/cplusplus/Symbols.h
- src/shared/cplusplus/Type.cpp 3 additions, 0 deletionssrc/shared/cplusplus/Type.cpp
- src/shared/cplusplus/Type.h 3 additions, 0 deletionssrc/shared/cplusplus/Type.h
- src/shared/cplusplus/TypeVisitor.h 1 addition, 0 deletionssrc/shared/cplusplus/TypeVisitor.h
Loading
Please register or sign in to comment