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

2ed47d32

Commit 2ed47d32 authored 16 years ago by hjk

Downloads
- Plain Diff

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

parents 3f53aa16 2c0a5209

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

doc/doc.pri 2 additions, 2 deletions

doc/doc.pri
src/plugins/cpptools/cppcodecompletion.cpp 2 additions, 3 deletions

src/plugins/cpptools/cppcodecompletion.cpp
src/plugins/qt4projectmanager/profileeditor.cpp 2 additions, 2 deletions

src/plugins/qt4projectmanager/profileeditor.cpp
src/plugins/qt4projectmanager/profileeditorfactory.cpp 0 additions, 1 deletion

src/plugins/qt4projectmanager/profileeditorfactory.cpp
src/plugins/qt4projectmanager/profilehighlighter.h 7 additions, 3 deletions

src/plugins/qt4projectmanager/profilehighlighter.h
src/plugins/qt4projectmanager/qt4projectmanager.pro 0 additions, 3 deletions

src/plugins/qt4projectmanager/qt4projectmanager.pro
src/plugins/qt4projectmanager/qt4projectmanagerenums.h 0 additions, 50 deletions

src/plugins/qt4projectmanager/qt4projectmanagerenums.h
src/plugins/texteditor/texteditorconstants.h 0 additions, 3 deletions

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

src/plugins/texteditor/texteditorsettings.cpp

with 13 additions and 71 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