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

9eb124c5

Commit 9eb124c5 authored 16 years ago by Daniel Molkentin

Downloads
- Plain Diff

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

parents bd43ebba ca7193d6

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

doc/qtcreator.qdoc 42 additions, 0 deletions

doc/qtcreator.qdoc
src/plugins/coreplugin/mainwindow.cpp 2 additions, 0 deletions

src/plugins/coreplugin/mainwindow.cpp
src/plugins/projectexplorer/images/filtericon.png 0 additions, 0 deletions

src/plugins/projectexplorer/images/filtericon.png
src/plugins/qt4projectmanager/directorywatcher.cpp 0 additions, 161 deletions

src/plugins/qt4projectmanager/directorywatcher.cpp
src/plugins/qt4projectmanager/directorywatcher.h 0 additions, 40 deletions

src/plugins/qt4projectmanager/directorywatcher.h
src/plugins/qt4projectmanager/qt4nodes.cpp 68 additions, 51 deletions

src/plugins/qt4projectmanager/qt4nodes.cpp
src/plugins/qt4projectmanager/qt4nodes.h 6 additions, 3 deletions

src/plugins/qt4projectmanager/qt4nodes.h
src/plugins/qt4projectmanager/qt4runconfiguration.cpp 4 additions, 8 deletions

src/plugins/qt4projectmanager/qt4runconfiguration.cpp

with 122 additions and 263 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