Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- share/qtcreator/gdbmacros/gdbmacros.cpp 68 additions, 13 deletionsshare/qtcreator/gdbmacros/gdbmacros.cpp
- share/qtcreator/gdbmacros/gdbmacros_p.h 4 additions, 0 deletionsshare/qtcreator/gdbmacros/gdbmacros_p.h
- share/qtcreator/translations/qtcreator_fr.ts 37 additions, 37 deletionsshare/qtcreator/translations/qtcreator_fr.ts
- src/plugins/cmakeprojectmanager/makestep.cpp 2 additions, 0 deletionssrc/plugins/cmakeprojectmanager/makestep.cpp
- src/plugins/cmakeprojectmanager/makestep.h 1 addition, 1 deletionsrc/plugins/cmakeprojectmanager/makestep.h
- src/plugins/debugger/gdb/gdbengine.cpp 21 additions, 2 deletionssrc/plugins/debugger/gdb/gdbengine.cpp
- src/plugins/fakevim/fakevim.pro 1 addition, 1 deletionsrc/plugins/fakevim/fakevim.pro
- src/plugins/genericprojectmanager/genericmakestep.cpp 12 additions, 2 deletionssrc/plugins/genericprojectmanager/genericmakestep.cpp
- src/plugins/genericprojectmanager/genericmakestep.h 1 addition, 0 deletionssrc/plugins/genericprojectmanager/genericmakestep.h
- src/plugins/help/help.pro 4 additions, 4 deletionssrc/plugins/help/help.pro
- src/plugins/help/help_dependencies.pri 4 additions, 0 deletionssrc/plugins/help/help_dependencies.pri
- src/plugins/projectexplorer/buildstep.cpp 9 additions, 2 deletionssrc/plugins/projectexplorer/buildstep.cpp
- src/plugins/projectexplorer/projectexplorer.cpp 3 additions, 0 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/projectexplorer/projectexplorer.h 8 additions, 0 deletionssrc/plugins/projectexplorer/projectexplorer.h
- src/plugins/qt4projectmanager/makestep.cpp 14 additions, 5 deletionssrc/plugins/qt4projectmanager/makestep.cpp
- src/plugins/qt4projectmanager/makestep.h 2 additions, 1 deletionsrc/plugins/qt4projectmanager/makestep.h
- src/plugins/qt4projectmanager/qmakestep.cpp 0 additions, 1 deletionsrc/plugins/qt4projectmanager/qmakestep.cpp
- tests/auto/debugger/main.cpp 81 additions, 6 deletionstests/auto/debugger/main.cpp
- tests/manual/trk/adapter.cpp 18 additions, 13 deletionstests/manual/trk/adapter.cpp
Loading
Please register or sign in to comment