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

10e963fb

Commit 10e963fb authored 16 years ago by Friedemann Kleint

Downloads
- Plain Diff

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

parents c4c2437d 4bf6d6c1

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/libs/extensionsystem/pluginview_p.h 1 addition, 1 deletion

src/libs/extensionsystem/pluginview_p.h
src/plugins/coreplugin/editormanager/editormanager.cpp 4 additions, 2 deletions

src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/cpptools/rpp/pp-engine.cpp 4 additions, 12 deletions

src/plugins/cpptools/rpp/pp-engine.cpp
src/plugins/cpptools/rpp/pp-macro-expander.cpp 1 addition, 2 deletions

src/plugins/cpptools/rpp/pp-macro-expander.cpp

with 10 additions and 17 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