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

c8e48efa

Commit c8e48efa authored 15 years ago by Alessandro Portale

Downloads
- Plain Diff

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

parents 92c034b1 3cb783f7

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/debugger/watchwindow.cpp 32 additions, 0 deletions

src/plugins/debugger/watchwindow.cpp
src/plugins/debugger/watchwindow.h 4 additions, 0 deletions

src/plugins/debugger/watchwindow.h
src/plugins/texteditor/basetexteditor.cpp 27 additions, 40 deletions

src/plugins/texteditor/basetexteditor.cpp
src/plugins/texteditor/basetexteditor.h 0 additions, 3 deletions

src/plugins/texteditor/basetexteditor.h
src/plugins/texteditor/basetexteditor_p.h 0 additions, 1 deletion

src/plugins/texteditor/basetexteditor_p.h
src/plugins/texteditor/displaysettings.cpp 6 additions, 1 deletion

src/plugins/texteditor/displaysettings.cpp
src/plugins/texteditor/displaysettings.h 1 addition, 0 deletions

src/plugins/texteditor/displaysettings.h
src/plugins/texteditor/displaysettingspage.cpp 2 additions, 0 deletions

src/plugins/texteditor/displaysettingspage.cpp
src/plugins/texteditor/displaysettingspage.ui 10 additions, 3 deletions

src/plugins/texteditor/displaysettingspage.ui

with 82 additions and 48 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