Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline (0f18d7aa) · 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

0f18d7aa

Commit 0f18d7aa authored 16 years ago by hjk

Downloads
- Plain Diff

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents fe0533de 8c591607

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/coreplugin/core.qrc 1 addition, 0 deletions

src/plugins/coreplugin/core.qrc
src/plugins/coreplugin/images/extension.png 0 additions, 0 deletions

src/plugins/coreplugin/images/extension.png
src/plugins/coreplugin/images/linkicon.png 0 additions, 0 deletions

src/plugins/coreplugin/images/linkicon.png
src/plugins/coreplugin/images/splitbutton_horizontal.png 0 additions, 0 deletions

src/plugins/coreplugin/images/splitbutton_horizontal.png
src/plugins/coreplugin/mainwindow.cpp 18 additions, 17 deletions

src/plugins/coreplugin/mainwindow.cpp
src/plugins/coreplugin/manhattanstyle.cpp 94 additions, 8 deletions

src/plugins/coreplugin/manhattanstyle.cpp
src/plugins/cpptools/cppcodecompletion.cpp 11 additions, 6 deletions

src/plugins/cpptools/cppcodecompletion.cpp
src/plugins/projectexplorer/images/filtericon.png 0 additions, 0 deletions

src/plugins/projectexplorer/images/filtericon.png

with 124 additions and 31 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