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

2d8af070

Commit 2d8af070 authored 16 years ago by hjk

Downloads
- Plain Diff

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

parents 7b47bd48 629832ce

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

shared/designerintegrationv2/formresizer.cpp 2 additions, 2 deletions

shared/designerintegrationv2/formresizer.cpp
shared/indenter/constants.cpp 6 additions, 8 deletions

shared/indenter/constants.cpp
shared/proparser/procommandmanager.cpp 3 additions, 5 deletions

shared/proparser/procommandmanager.cpp
shared/proparser/profileevaluator.cpp 1 addition, 3 deletions

shared/proparser/profileevaluator.cpp
shared/qrceditor/resourcefile.cpp 39 additions, 41 deletions

shared/qrceditor/resourcefile.cpp
shared/qrceditor/resourcefile_p.h 1 addition, 3 deletions

shared/qrceditor/resourcefile_p.h
shared/qrceditor/resourceview.cpp 8 additions, 10 deletions

shared/qrceditor/resourceview.cpp
shared/qrceditor/undocommands.cpp 3 additions, 3 deletions

shared/qrceditor/undocommands.cpp
shared/scriptwrapper/wrap_helpers.h 2 additions, 4 deletions

shared/scriptwrapper/wrap_helpers.h

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