Merge commit 'df16699ed9958584bb53e8790ccbcdc1e4b42dbb' (5130e203) · 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

5130e203

Commit 5130e203 authored 16 years ago by hjk

Downloads
- Plain Diff

Merge commit 'df16699e'

Conflicts:
	src/plugins/debugger/procinterrupt.cpp

parents 96e489a3 df16699e

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

share/qtcreator/gdbmacros/gdbmacros.cpp 2 additions, 0 deletions

share/qtcreator/gdbmacros/gdbmacros.cpp
src/plugins/debugger/gdbengine.cpp 97 additions, 97 deletions

src/plugins/debugger/gdbengine.cpp
src/plugins/debugger/procinterrupt.cpp 1 addition, 2 deletions

src/plugins/debugger/procinterrupt.cpp

with 100 additions and 99 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