Merge remote branch 'origin/2.0' (ec1bc282) · Commits · Marco Bubke / flatpak-qt-creator · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

flatpak-qt-creator
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

ec1bc282

Commit ec1bc282 authored 14 years ago by Oswald Buddenhagen

Downloads
- Plain Diff

Merge remote branch 'origin/2.0'

Conflicts:
	src/shared/proparser/profileevaluator.cpp

parents af44136e 51a75e3c

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp 15 additions, 3 deletions

src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp 1 addition, 1 deletion

...plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp 1 addition, 1 deletion

src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
src/shared/proparser/profileevaluator.cpp 22 additions, 4 deletions

src/shared/proparser/profileevaluator.cpp

with 39 additions and 9 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