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

ff433b44

Commit ff433b44 authored 16 years ago by hjk

Downloads
- Plain Diff

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

parents f61e8672 7d6f2bb4

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

doc/qtcreator.qdoc 23 additions, 23 deletions

doc/qtcreator.qdoc
shared/help/helpviewer.cpp 1 addition, 1 deletion

shared/help/helpviewer.cpp
shared/help/helpviewer.h 2 additions, 2 deletions

shared/help/helpviewer.h
src/plugins/coreplugin/coreplugin.cpp 2 additions, 2 deletions

src/plugins/coreplugin/coreplugin.cpp
src/plugins/coreplugin/coreplugin.pro 1 addition, 2 deletions

src/plugins/coreplugin/coreplugin.pro
src/plugins/coreplugin/welcomemode.cpp 6 additions, 6 deletions

src/plugins/coreplugin/welcomemode.cpp
src/plugins/cpptools/rpp/pp-fwd.h 0 additions, 62 deletions

src/plugins/cpptools/rpp/pp-fwd.h
src/plugins/cpptools/rpp/pp-internal.h 0 additions, 21 deletions

src/plugins/cpptools/rpp/pp-internal.h
src/plugins/cpptools/rpp/pp-symbol.h 0 additions, 52 deletions

src/plugins/cpptools/rpp/pp-symbol.h
src/plugins/cpptools/rpp/pp.h 0 additions, 7 deletions

src/plugins/cpptools/rpp/pp.h
src/plugins/cpptools/rpp/rpp.pri 0 additions, 2 deletions

src/plugins/cpptools/rpp/rpp.pri
src/plugins/help/centralwidget.cpp 4 additions, 4 deletions

src/plugins/help/centralwidget.cpp
src/plugins/help/help.pro 2 additions, 2 deletions

src/plugins/help/help.pro
src/plugins/help/helpfindsupport.cpp 1 addition, 1 deletion

src/plugins/help/helpfindsupport.cpp

with 42 additions and 187 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