Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
Showing
- qtcreator.pri 2 additions, 3 deletionsqtcreator.pri
- src/plugins/debugger/registerhandler.cpp 3 additions, 3 deletionssrc/plugins/debugger/registerhandler.cpp
- src/plugins/debugger/watchhandler.cpp 1 addition, 1 deletionsrc/plugins/debugger/watchhandler.cpp
- src/plugins/help/helpplugin.cpp 3 additions, 3 deletionssrc/plugins/help/helpplugin.cpp
- src/plugins/projectexplorer/toolchain.cpp 2 additions, 1 deletionsrc/plugins/projectexplorer/toolchain.cpp
- src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp 1 addition, 1 deletion.../qt4projectmanager/customwidgetwizard/plugingenerator.cpp
- src/shared/help/bookmarkmanager.cpp 2 additions, 1 deletionsrc/shared/help/bookmarkmanager.cpp
- src/shared/proparser/profileevaluator.cpp 1 addition, 1 deletionsrc/shared/proparser/profileevaluator.cpp
- tests/manual/proparser/testreader.pro 1 addition, 0 deletionstests/manual/proparser/testreader.pro
Loading
Please register or sign in to comment