Merge commit 'origin/1.3'
Conflicts: src/plugins/qt4projectmanager/qt4project.cpp
No related branches found
No related tags found
Showing
- doc/doc.pri 1 addition, 2 deletionsdoc/doc.pri
- share/qtcreator/gdbmacros/gdbmacros.cpp 1 addition, 1 deletionshare/qtcreator/gdbmacros/gdbmacros.cpp
- src/libs/cplusplus/CppBindings.cpp 19 additions, 0 deletionssrc/libs/cplusplus/CppBindings.cpp
- src/libs/cplusplus/FindUsages.cpp 9 additions, 0 deletionssrc/libs/cplusplus/FindUsages.cpp
- src/libs/cplusplus/FindUsages.h 1 addition, 0 deletionssrc/libs/cplusplus/FindUsages.h
- src/plugins/coreplugin/progressmanager/progressmanager.cpp 11 additions, 0 deletionssrc/plugins/coreplugin/progressmanager/progressmanager.cpp
- src/plugins/coreplugin/progressmanager/progressmanager.h 4 additions, 0 deletionssrc/plugins/coreplugin/progressmanager/progressmanager.h
- src/plugins/cpaster/cpasterplugin.cpp 1 addition, 0 deletionssrc/plugins/cpaster/cpasterplugin.cpp
- src/plugins/cppeditor/cppplugin.cpp 27 additions, 8 deletionssrc/plugins/cppeditor/cppplugin.cpp
- src/plugins/cppeditor/cppplugin.h 8 additions, 3 deletionssrc/plugins/cppeditor/cppplugin.h
- src/plugins/cpptools/cppcodecompletion.cpp 8 additions, 8 deletionssrc/plugins/cpptools/cppcodecompletion.cpp
- src/plugins/cpptools/cppfindreferences.cpp 18 additions, 2 deletionssrc/plugins/cpptools/cppfindreferences.cpp
- src/plugins/debugger/debuggeragents.cpp 4 additions, 0 deletionssrc/plugins/debugger/debuggeragents.cpp
- src/plugins/debugger/gdb/gdbengine.cpp 41 additions, 22 deletionssrc/plugins/debugger/gdb/gdbengine.cpp
- src/plugins/debugger/gdb/gdbengine.h 4 additions, 0 deletionssrc/plugins/debugger/gdb/gdbengine.h
- src/plugins/debugger/stackwindow.cpp 6 additions, 0 deletionssrc/plugins/debugger/stackwindow.cpp
- src/plugins/debugger/stackwindow.h 1 addition, 0 deletionssrc/plugins/debugger/stackwindow.h
- src/plugins/debugger/watchhandler.cpp 11 additions, 4 deletionssrc/plugins/debugger/watchhandler.cpp
- src/plugins/debugger/watchhandler.h 2 additions, 1 deletionsrc/plugins/debugger/watchhandler.h
- src/plugins/find/searchresultwindow.cpp 25 additions, 18 deletionssrc/plugins/find/searchresultwindow.cpp
Loading
Please register or sign in to comment