Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
Showing
- doc/qtcreator-texteditor-completion.png 0 additions, 0 deletionsdoc/qtcreator-texteditor-completion.png
- doc/qtcreator-texteditor-fonts.png 0 additions, 0 deletionsdoc/qtcreator-texteditor-fonts.png
- doc/qtcreator-texteditor-general.png 0 additions, 0 deletionsdoc/qtcreator-texteditor-general.png
- doc/qtcreator.qdoc 27 additions, 13 deletionsdoc/qtcreator.qdoc
- src/plugins/coreplugin/editormanager/editormanager.cpp 3 additions, 1 deletionsrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/coreplugin/html/images/feedback-text.png 0 additions, 0 deletionssrc/plugins/coreplugin/html/images/feedback-text.png
- src/plugins/cpaster/cpasterplugin.cpp 21 additions, 5 deletionssrc/plugins/cpaster/cpasterplugin.cpp
- src/plugins/cpaster/cpasterplugin.h 1 addition, 0 deletionssrc/plugins/cpaster/cpasterplugin.h
- src/plugins/fakevim/fakevimplugin.cpp 9 additions, 0 deletionssrc/plugins/fakevim/fakevimplugin.cpp
- src/plugins/qt4projectmanager/qtversionmanager.cpp 15 additions, 2 deletionssrc/plugins/qt4projectmanager/qtversionmanager.cpp
- src/plugins/qt4projectmanager/qtversionmanager.h 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qtversionmanager.h
- src/shared/proparser/profileevaluator.cpp 2 additions, 1 deletionsrc/shared/proparser/profileevaluator.cpp
- src/tools/qtlibspatcher/qtlibspatchermain.cpp 17 additions, 4 deletionssrc/tools/qtlibspatcher/qtlibspatchermain.cpp
- tests/auto/cplusplus/ast/ast.pro 3 additions, 2 deletionstests/auto/cplusplus/ast/ast.pro
- tests/auto/cplusplus/semantic/semantic.pro 3 additions, 2 deletionstests/auto/cplusplus/semantic/semantic.pro
- tests/auto/cplusplus/shared/shared.pri 1 addition, 1 deletiontests/auto/cplusplus/shared/shared.pri
- tests/auto/cplusplus/shared/shared.pro 1 addition, 1 deletiontests/auto/cplusplus/shared/shared.pro
Loading
Please register or sign in to comment