Merge branch '1.3' (f098f039) · 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

f098f039

Commit f098f039 authored 15 years ago by Thorbjørn Lindeijer

Downloads
- Plain Diff

Merge branch '1.3'

Conflicts:
	src/plugins/projectexplorer/outputwindow.cpp

parents b9927f99 777071c9

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/debugger/breakhandler.cpp 14 additions, 2 deletions

src/plugins/debugger/breakhandler.cpp
src/plugins/debugger/cdb/cdb.pri 1 addition, 0 deletions

src/plugins/debugger/cdb/cdb.pri
src/plugins/debugger/cdb/cdbbreakpoint.cpp 101 additions, 9 deletions

src/plugins/debugger/cdb/cdbbreakpoint.cpp
src/plugins/debugger/cdb/cdbbreakpoint.h 2 additions, 1 deletion

src/plugins/debugger/cdb/cdbbreakpoint.h
src/plugins/debugger/cdb/cdbdebugengine.cpp 4 additions, 5 deletions

src/plugins/debugger/cdb/cdbdebugengine.cpp
src/plugins/debugger/cdb/cdbdebugengine_p.h 2 additions, 0 deletions

src/plugins/debugger/cdb/cdbdebugengine_p.h
src/plugins/debugger/cdb/cdbdumperhelper.cpp 4 additions, 4 deletions

src/plugins/debugger/cdb/cdbdumperhelper.cpp
src/plugins/debugger/cdb/cdbstacktracecontext.cpp 1 addition, 1 deletion

src/plugins/debugger/cdb/cdbstacktracecontext.cpp
src/plugins/projectexplorer/outputwindow.cpp 0 additions, 1 deletion

src/plugins/projectexplorer/outputwindow.cpp

with 129 additions and 23 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