Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Conflicts: src/plugins/debugger/gdbtypemacros.ui
No related branches found
No related tags found
Showing
- doc/qtcreator.qdoc 39 additions, 38 deletionsdoc/qtcreator.qdoc
- src/app/main.cpp 1 addition, 1 deletionsrc/app/main.cpp
- src/libs/cplusplus/CppDocument.cpp 7 additions, 3 deletionssrc/libs/cplusplus/CppDocument.cpp
- src/libs/cplusplus/CppDocument.h 21 additions, 2 deletionssrc/libs/cplusplus/CppDocument.h
- src/libs/cplusplus/TypeOfExpression.cpp 38 additions, 2 deletionssrc/libs/cplusplus/TypeOfExpression.cpp
- src/libs/cplusplus/TypeOfExpression.h 18 additions, 1 deletionsrc/libs/cplusplus/TypeOfExpression.h
- 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/extensionsystem/optionsparser.cpp 1 addition, 1 deletionsrc/libs/extensionsystem/optionsparser.cpp
- src/libs/extensionsystem/pluginmanager.cpp 11 additions, 4 deletionssrc/libs/extensionsystem/pluginmanager.cpp
- src/libs/extensionsystem/pluginmanager.h 1 addition, 1 deletionsrc/libs/extensionsystem/pluginmanager.h
- src/libs/extensionsystem/pluginmanager_p.h 1 addition, 1 deletionsrc/libs/extensionsystem/pluginmanager_p.h
- src/libs/extensionsystem/pluginspec.cpp 2 additions, 2 deletionssrc/libs/extensionsystem/pluginspec.cpp
- src/libs/extensionsystem/pluginspec_p.h 1 addition, 1 deletionsrc/libs/extensionsystem/pluginspec_p.h
- src/plugins/coreplugin/mainwindow.cpp 9 additions, 0 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/cppeditor/cppeditor.cpp 21 additions, 4 deletionssrc/plugins/cppeditor/cppeditor.cpp
- src/plugins/cppeditor/cppeditor.h 3 additions, 0 deletionssrc/plugins/cppeditor/cppeditor.h
- src/plugins/cpptools/cppcodecompletion.cpp 2 additions, 1 deletionsrc/plugins/cpptools/cppcodecompletion.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
Loading
Please register or sign in to comment