Merge branch '1.0.0' (3230017e) · 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

3230017e

Commit 3230017e authored 16 years ago by Thorbjørn Lindeijer

Downloads
- Plain Diff

Merge branch '1.0.0'

Conflicts:
	src/libs/cplusplus/Overview.h
	src/libs/cplusplus/TypePrettyPrinter.cpp
	src/plugins/cpptools/cppcodecompletion.cpp

parents fa216de4 d94dd392

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/cpptools/cppcodecompletion.cpp 5 additions, 5 deletions

src/plugins/cpptools/cppcodecompletion.cpp
src/plugins/debugger/debuggermanager.cpp 2 additions, 2 deletions

src/plugins/debugger/debuggermanager.cpp
src/plugins/texteditor/basetexteditor.cpp 5 additions, 5 deletions

src/plugins/texteditor/basetexteditor.cpp
src/plugins/texteditor/basetexteditor_p.h 1 addition, 1 deletion

src/plugins/texteditor/basetexteditor_p.h

with 13 additions and 13 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