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

f3141d99

Commit f3141d99 authored 16 years ago by hjk

Downloads
- Plain Diff

Merge branch '1.0.0'

Conflicts:
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
	src/plugins/debugger/gdbengine.cpp

parents 815bec12 7587f6e3

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/cpptools/cppcodecompletion.cpp 3 additions, 1 deletion

src/plugins/cpptools/cppcodecompletion.cpp
src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp 9 additions, 1 deletion

src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp 2 additions, 1 deletion

src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/texteditor/basetexteditor.cpp 1 addition, 1 deletion

src/plugins/texteditor/basetexteditor.cpp

with 15 additions and 4 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