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

51ce82a7

Commit 51ce82a7 authored 15 years ago by hjk

Downloads
- Plain Diff

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

parents 56b24aac b0227ce4

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

share/qtcreator/translations/qtcreator_de.ts 1 addition, 1 deletion

share/qtcreator/translations/qtcreator_de.ts
share/qtcreator/translations/qtcreator_es.ts 1 addition, 1 deletion

share/qtcreator/translations/qtcreator_es.ts
src/plugins/cpptools/cppmodelmanager.cpp 4 additions, 0 deletions

src/plugins/cpptools/cppmodelmanager.cpp
src/plugins/cpptools/cppmodelmanager.h 3 additions, 0 deletions

src/plugins/cpptools/cppmodelmanager.h
src/plugins/qt4projectmanager/profilereader.cpp 0 additions, 48 deletions

src/plugins/qt4projectmanager/profilereader.cpp
src/plugins/qt4projectmanager/profilereader.h 0 additions, 5 deletions

src/plugins/qt4projectmanager/profilereader.h
src/plugins/qt4projectmanager/qt4nodes.cpp 24 additions, 9 deletions

src/plugins/qt4projectmanager/qt4nodes.cpp
src/plugins/qt4projectmanager/qt4project.cpp 1 addition, 1 deletion

src/plugins/qt4projectmanager/qt4project.cpp
src/shared/proparser/profileevaluator.cpp 53 additions, 165 deletions

src/shared/proparser/profileevaluator.cpp
src/shared/proparser/profileevaluator.h 4 additions, 6 deletions

src/shared/proparser/profileevaluator.h

with 91 additions and 236 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