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

43a14ac2

Commit 43a14ac2 authored 15 years ago by Alessandro Portale

Downloads
- Plain Diff

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

parents 06ee5c1e 6d3571d9

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/cmakeprojectmanager/cmakeproject.cpp 7 additions, 0 deletions

src/plugins/cmakeprojectmanager/cmakeproject.cpp
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp 92 additions, 14 deletions

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
src/plugins/cmakeprojectmanager/cmakerunconfiguration.h 26 additions, 8 deletions

src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
src/plugins/projectexplorer/customexecutablerunconfiguration.cpp 70 additions, 6 deletions

...gins/projectexplorer/customexecutablerunconfiguration.cpp
src/plugins/projectexplorer/customexecutablerunconfiguration.h 15 additions, 0 deletions

...lugins/projectexplorer/customexecutablerunconfiguration.h
src/plugins/qt4projectmanager/qtversionmanager.cpp 1 addition, 0 deletions

src/plugins/qt4projectmanager/qtversionmanager.cpp

with 211 additions and 28 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