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

3a715bf0

Commit 3a715bf0 authored 16 years ago by hjk

Downloads
- Plain Diff

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

parents 1562193b f3b3d23c

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

share/qtcreator/templates/qt4project/widget.ui 1 addition, 4 deletions

share/qtcreator/templates/qt4project/widget.ui
src/plugins/designer/formtemplatewizardpage.cpp 5 additions, 0 deletions

src/plugins/designer/formtemplatewizardpage.cpp
src/plugins/designer/settingsmanager.cpp 4 additions, 4 deletions

src/plugins/designer/settingsmanager.cpp
src/plugins/designer/workbenchintegration.cpp 37 additions, 9 deletions

src/plugins/designer/workbenchintegration.cpp
src/plugins/projectexplorer/projectwindow.h 0 additions, 2 deletions

src/plugins/projectexplorer/projectwindow.h
src/plugins/projectexplorer/taskwindow.cpp 3 additions, 2 deletions

src/plugins/projectexplorer/taskwindow.cpp

with 50 additions and 21 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