Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- doc/qtcreator.qdoc 87 additions, 2 deletionsdoc/qtcreator.qdoc
- src/plugins/debugger/debugger.pro 3 additions, 2 deletionssrc/plugins/debugger/debugger.pro
- src/plugins/debugger/debuggermanager.cpp 2 additions, 2 deletionssrc/plugins/debugger/debuggermanager.cpp
- src/plugins/debugger/debuggermanager.h 3 additions, 3 deletionssrc/plugins/debugger/debuggermanager.h
- src/plugins/debugger/debuggerrunner.cpp 4 additions, 7 deletionssrc/plugins/debugger/debuggerrunner.cpp
- src/plugins/debugger/debuggerrunner.h 1 addition, 1 deletionsrc/plugins/debugger/debuggerrunner.h
- src/plugins/debugger/gdbengine.cpp 28 additions, 22 deletionssrc/plugins/debugger/gdbengine.cpp
- src/plugins/debugger/gdbengine.h 8 additions, 1 deletionsrc/plugins/debugger/gdbengine.h
- src/plugins/debugger/outputcollector.cpp 179 additions, 0 deletionssrc/plugins/debugger/outputcollector.cpp
- src/plugins/debugger/outputcollector.h 91 additions, 0 deletionssrc/plugins/debugger/outputcollector.h
- src/plugins/projectexplorer/applicationlauncher.h 8 additions, 0 deletionssrc/plugins/projectexplorer/applicationlauncher.h
- src/plugins/projectexplorer/applicationlauncher_win.cpp 1 addition, 4 deletionssrc/plugins/projectexplorer/applicationlauncher_win.cpp
- src/plugins/projectexplorer/applicationlauncher_x11.cpp 4 additions, 7 deletionssrc/plugins/projectexplorer/applicationlauncher_x11.cpp
- src/plugins/projectexplorer/applicationrunconfiguration.cpp 2 additions, 2 deletionssrc/plugins/projectexplorer/applicationrunconfiguration.cpp
- src/plugins/projectexplorer/outputwindow.cpp 16 additions, 1 deletionsrc/plugins/projectexplorer/outputwindow.cpp
- src/plugins/projectexplorer/outputwindow.h 2 additions, 0 deletionssrc/plugins/projectexplorer/outputwindow.h
- src/plugins/projectexplorer/projectexplorer.cpp 7 additions, 0 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/projectexplorer/projectexplorer.h 1 addition, 0 deletionssrc/plugins/projectexplorer/projectexplorer.h
- src/plugins/projectexplorer/runconfiguration.h 1 addition, 0 deletionssrc/plugins/projectexplorer/runconfiguration.h
- src/plugins/qt4projectmanager/speinfo.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/speinfo.cpp
Loading
Please register or sign in to comment