Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- src/libs/cplusplus/SimpleLexer.cpp 2 additions, 1 deletionsrc/libs/cplusplus/SimpleLexer.cpp
- src/plugins/cppeditor/cppeditor.cpp 10 additions, 1 deletionsrc/plugins/cppeditor/cppeditor.cpp
- src/plugins/cppeditor/cpphighlighter.cpp 1 addition, 1 deletionsrc/plugins/cppeditor/cpphighlighter.cpp
- src/plugins/projectexplorer/projectexplorer.pro 2 additions, 1 deletionsrc/plugins/projectexplorer/projectexplorer.pro
- src/shared/cplusplus/Lexer.cpp 1 addition, 1 deletionsrc/shared/cplusplus/Lexer.cpp
- src/shared/cplusplus/Token.cpp 1 addition, 0 deletionssrc/shared/cplusplus/Token.cpp
- src/shared/cplusplus/Token.h 4 additions, 1 deletionsrc/shared/cplusplus/Token.h
Loading
Please register or sign in to comment