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

07718288

Commit 07718288 authored 16 years ago by dt

Downloads
- Plain Diff

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

parents d83e0e74 d47a001b

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

share/qtcreator/templates/qt4project/mywidget_form.cpp 1 addition, 1 deletion

share/qtcreator/templates/qt4project/mywidget_form.cpp
share/qtcreator/templates/qt4project/mywidget_form.h 2 additions, 2 deletions

share/qtcreator/templates/qt4project/mywidget_form.h
share/qtcreator/templates/qt4project/widget.ui 1 addition, 1 deletion

share/qtcreator/templates/qt4project/widget.ui
src/plugins/coreplugin/mainwindow.cpp 5 additions, 4 deletions

src/plugins/coreplugin/mainwindow.cpp
src/plugins/debugger/debuggermanager.cpp 12 additions, 0 deletions

src/plugins/debugger/debuggermanager.cpp
src/plugins/debugger/debuggermanager.h 2 additions, 0 deletions

src/plugins/debugger/debuggermanager.h
src/plugins/debugger/gdbengine.cpp 17 additions, 0 deletions

src/plugins/debugger/gdbengine.cpp
src/plugins/debugger/moduleswindow.cpp 55 additions, 6 deletions

src/plugins/debugger/moduleswindow.cpp
src/plugins/debugger/moduleswindow.h 2 additions, 0 deletions

src/plugins/debugger/moduleswindow.h
src/plugins/fakevim/fakevimhandler.cpp 6 additions, 4 deletions

src/plugins/fakevim/fakevimhandler.cpp

with 103 additions and 18 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