Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline (e3f748b5) · Commits · Tobias Hunger / qt-creator · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qt-creator
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

e3f748b5

Commit e3f748b5 authored 16 years ago by dt

Downloads
- Plain Diff

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents f25638f7 f867061d

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/debugger/debuggermanager.cpp 2 additions, 12 deletions

src/plugins/debugger/debuggermanager.cpp
src/plugins/debugger/debuggermanager.h 13 additions, 3 deletions

src/plugins/debugger/debuggermanager.h
src/plugins/debugger/debuggerplugin.cpp 2 additions, 1 deletion

src/plugins/debugger/debuggerplugin.cpp
src/plugins/debugger/gdbengine.cpp 69 additions, 195 deletions

src/plugins/debugger/gdbengine.cpp
src/plugins/debugger/gdbengine.h 1 addition, 5 deletions

src/plugins/debugger/gdbengine.h
src/plugins/debugger/gdboptionpage.ui 1 addition, 1 deletion

src/plugins/debugger/gdboptionpage.ui
src/plugins/debugger/idebuggerengine.h 0 additions, 1 deletion

src/plugins/debugger/idebuggerengine.h
src/plugins/projectexplorer/toolchain.cpp 20 additions, 6 deletions

src/plugins/projectexplorer/toolchain.cpp
src/plugins/qt4projectmanager/qt4project.cpp 18 additions, 2 deletions

src/plugins/qt4projectmanager/qt4project.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp 5 additions, 4 deletions

src/plugins/qt4projectmanager/qtversionmanager.cpp

with 131 additions and 230 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment