Merge commit 'origin/1.3' (c1120587) · 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

c1120587

Commit c1120587 authored 15 years ago by mae

Downloads
- Plain Diff

Merge commit 'origin/1.3'

Conflicts:
	src/plugins/cppeditor/cppeditor.cpp

parents 480c9a5b 3ef32636

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

doc/qtcreator.qdoc 3 additions, 2 deletions

doc/qtcreator.qdoc
src/libs/cplusplus/pp-engine.cpp 1 addition, 1 deletion

src/libs/cplusplus/pp-engine.cpp
src/plugins/cppeditor/cppeditor.cpp 9 additions, 5 deletions

src/plugins/cppeditor/cppeditor.cpp
src/plugins/texteditor/basetexteditor.cpp 3 additions, 1 deletion

src/plugins/texteditor/basetexteditor.cpp

with 16 additions and 9 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