Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- share/qtcreator/templates/qt4project/widget.ui 1 addition, 1 deletionshare/qtcreator/templates/qt4project/widget.ui
- src/plugins/cpptools/cppcodecompletion.cpp 1 addition, 1 deletionsrc/plugins/cpptools/cppcodecompletion.cpp
- src/plugins/cpptools/cppmodelmanager.cpp 4 additions, 5 deletionssrc/plugins/cpptools/cppmodelmanager.cpp
- src/plugins/designer/cpp/formclasswizardparameters.cpp 1 addition, 0 deletionssrc/plugins/designer/cpp/formclasswizardparameters.cpp
- src/plugins/git/branchmodel.cpp 2 additions, 1 deletionsrc/plugins/git/branchmodel.cpp
- src/plugins/git/gitclient.cpp 24 additions, 16 deletionssrc/plugins/git/gitclient.cpp
- src/plugins/git/gitclient.h 2 additions, 0 deletionssrc/plugins/git/gitclient.h
- src/plugins/git/gitcommand.cpp 27 additions, 0 deletionssrc/plugins/git/gitcommand.cpp
- src/plugins/git/gitcommand.h 4 additions, 0 deletionssrc/plugins/git/gitcommand.h
- src/shared/cplusplus/AST.cpp 4 additions, 0 deletionssrc/shared/cplusplus/AST.cpp
- src/shared/cplusplus/AST.h 1 addition, 0 deletionssrc/shared/cplusplus/AST.h
- src/shared/cplusplus/CheckDeclarator.cpp 1 addition, 0 deletionssrc/shared/cplusplus/CheckDeclarator.cpp
- src/shared/cplusplus/Parser.cpp 43 additions, 2 deletionssrc/shared/cplusplus/Parser.cpp
- src/shared/cplusplus/Parser.h 1 addition, 1 deletionsrc/shared/cplusplus/Parser.h
- src/shared/cplusplus/Symbols.cpp 6 additions, 0 deletionssrc/shared/cplusplus/Symbols.cpp
- src/shared/cplusplus/Symbols.h 4 additions, 0 deletionssrc/shared/cplusplus/Symbols.h
Loading
Please register or sign in to comment