Merge branch '1.0.0' into master (cf66237c) · 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

cf66237c

Commit cf66237c authored 16 years ago by Oswald Buddenhagen

Downloads
- Plain Diff

Merge branch '1.0.0' into master

Conflicts:
	src/plugins/coreplugin/manhattanstyle.cpp

parents 0220b451 c0f2f81c

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/coreplugin/manhattanstyle.cpp 33 additions, 36 deletions

src/plugins/coreplugin/manhattanstyle.cpp
src/tools/qtlibspatcher/qtlibspatcher.sh 2 additions, 2 deletions

src/tools/qtlibspatcher/qtlibspatcher.sh
src/tools/qtlibspatcher/qtlibspatchermain.cpp 38 additions, 38 deletions

src/tools/qtlibspatcher/qtlibspatchermain.cpp
tests/manual/gdbdebugger/simple/app.cpp 4 additions, 1 deletion

tests/manual/gdbdebugger/simple/app.cpp
tests/manual/gdbdebugger/simple/app/app.pro 2 additions, 0 deletions

tests/manual/gdbdebugger/simple/app/app.pro

with 79 additions and 77 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