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

fefe6b37

Commit fefe6b37 authored 15 years ago by dt

Downloads
- Plain Diff

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

parents fe78b088 5c9778e7

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/coreplugin/welcomemode.ui 3 additions, 3 deletions

src/plugins/coreplugin/welcomemode.ui
src/plugins/projectexplorer/qtversionmanager.cpp 2 additions, 2 deletions

src/plugins/projectexplorer/qtversionmanager.cpp
src/plugins/texteditor/basetexteditor.cpp 143 additions, 27 deletions

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

src/plugins/texteditor/basetexteditor.h
src/plugins/texteditor/basetexteditor_p.h 17 additions, 0 deletions

src/plugins/texteditor/basetexteditor_p.h
src/plugins/texteditor/displaysettings.cpp 4 additions, 4 deletions

src/plugins/texteditor/displaysettings.cpp

with 173 additions and 36 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