Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline (eae597f5) · 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

eae597f5

Commit eae597f5 authored 15 years ago by dt

Downloads
- Plain Diff

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

parents a6ad9b38 d37a2d3a

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/debugger/breakhandler.cpp 80 additions, 15 deletions

src/plugins/debugger/breakhandler.cpp
src/plugins/debugger/breakhandler.h 11 additions, 3 deletions

src/plugins/debugger/breakhandler.h
src/plugins/debugger/breakwindow.cpp 9 additions, 0 deletions

src/plugins/debugger/breakwindow.cpp
src/plugins/debugger/debugger.qrc 1 addition, 0 deletions

src/plugins/debugger/debugger.qrc
src/plugins/debugger/debuggeractions.cpp 4 additions, 3 deletions

src/plugins/debugger/debuggeractions.cpp
src/plugins/debugger/debuggermanager.cpp 31 additions, 4 deletions

src/plugins/debugger/debuggermanager.cpp
src/plugins/debugger/debuggermanager.h 2 additions, 0 deletions

src/plugins/debugger/debuggermanager.h
src/plugins/debugger/debuggerplugin.cpp 67 additions, 35 deletions

src/plugins/debugger/debuggerplugin.cpp
src/plugins/debugger/debuggerplugin.h 3 additions, 4 deletions

src/plugins/debugger/debuggerplugin.h
src/plugins/debugger/gdbengine.cpp 18 additions, 0 deletions

src/plugins/debugger/gdbengine.cpp
src/plugins/debugger/images/breakpoint_disabled.svg 171 additions, 0 deletions

src/plugins/debugger/images/breakpoint_disabled.svg

with 397 additions and 64 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