Merge remote branch 'origin/1.3' (7081a3d4) · 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

7081a3d4

Commit 7081a3d4 authored 15 years ago by con

Downloads
- Plain Diff

Merge remote branch 'origin/1.3'

Conflicts:
	src/plugins/projectexplorer/outputwindow.cpp

parents bad8a15f 8f586ced

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

doc/qtcreator.qdoc 2 additions, 1 deletion

doc/qtcreator.qdoc
share/qtcreator/translations/qtcreator_pl.ts 174 additions, 458 deletions

share/qtcreator/translations/qtcreator_pl.ts
src/libs/cplusplus/CheckUndefinedSymbols.cpp 6 additions, 0 deletions

src/libs/cplusplus/CheckUndefinedSymbols.cpp
src/plugins/genericprojectmanager/genericprojectnodes.cpp 4 additions, 1 deletion

src/plugins/genericprojectmanager/genericprojectnodes.cpp
src/plugins/projectexplorer/debugginghelper.cpp 0 additions, 4 deletions

src/plugins/projectexplorer/debugginghelper.cpp
src/plugins/projectexplorer/outputwindow.cpp 23 additions, 2 deletions

src/plugins/projectexplorer/outputwindow.cpp
src/plugins/projectexplorer/outputwindow.h 1 addition, 0 deletions

src/plugins/projectexplorer/outputwindow.h
src/plugins/qmlprojectmanager/qmlprojectnodes.cpp 5 additions, 1 deletion

src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp 1 addition, 2 deletions

src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/texteditor/basetexteditor.cpp 4 additions, 4 deletions

src/plugins/texteditor/basetexteditor.cpp

with 220 additions and 473 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