Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts: src/plugins/debugger/gdbengine.cpp
Showing
- doc/qtcreator.qdoc 1 addition, 1 deletiondoc/qtcreator.qdoc
- src/libs/extensionsystem/patchedpluginloader.cpp 0 additions, 23 deletionssrc/libs/extensionsystem/patchedpluginloader.cpp
- src/plugins/coreplugin/editormanager/editormanager.cpp 1 addition, 0 deletionssrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/coreplugin/editormanager/editorview.cpp 11 additions, 0 deletionssrc/plugins/coreplugin/editormanager/editorview.cpp
- src/plugins/coreplugin/editormanager/editorview.h 1 addition, 0 deletionssrc/plugins/coreplugin/editormanager/editorview.h
- src/plugins/coreplugin/mainwindow.cpp 9 additions, 7 deletionssrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/coreplugin/mainwindow.h 0 additions, 2 deletionssrc/plugins/coreplugin/mainwindow.h
- src/plugins/debugger/breakhandler.cpp 1 addition, 1 deletionsrc/plugins/debugger/breakhandler.cpp
- src/plugins/debugger/breakhandler.h 1 addition, 1 deletionsrc/plugins/debugger/breakhandler.h
- src/plugins/debugger/breakwindow.cpp 17 additions, 8 deletionssrc/plugins/debugger/breakwindow.cpp
- src/plugins/debugger/breakwindow.h 4 additions, 2 deletionssrc/plugins/debugger/breakwindow.h
- src/plugins/debugger/debuggermanager.cpp 52 additions, 3 deletionssrc/plugins/debugger/debuggermanager.cpp
- src/plugins/debugger/debuggermanager.h 7 additions, 1 deletionsrc/plugins/debugger/debuggermanager.h
- src/plugins/debugger/debuggerplugin.cpp 4 additions, 0 deletionssrc/plugins/debugger/debuggerplugin.cpp
- src/plugins/debugger/gdbengine.cpp 8 additions, 1 deletionsrc/plugins/debugger/gdbengine.cpp
- src/plugins/debugger/gdboptionpage.ui 14 additions, 4 deletionssrc/plugins/debugger/gdboptionpage.ui
- src/plugins/debugger/moduleswindow.cpp 29 additions, 6 deletionssrc/plugins/debugger/moduleswindow.cpp
- src/plugins/debugger/moduleswindow.h 3 additions, 2 deletionssrc/plugins/debugger/moduleswindow.h
- src/plugins/debugger/sourcefileswindow.cpp 27 additions, 8 deletionssrc/plugins/debugger/sourcefileswindow.cpp
- src/plugins/debugger/sourcefileswindow.h 2 additions, 1 deletionsrc/plugins/debugger/sourcefileswindow.h
Loading
Please register or sign in to comment