Merge commit 'origin/1.2'
Conflicts: src/plugins/debugger/breakwindow.cpp
No related branches found
No related tags found
Showing
- dist/changes-1.2.0 13 additions, 9 deletionsdist/changes-1.2.0
- doc/addressbook-sdk.qdoc 6 additions, 4 deletionsdoc/addressbook-sdk.qdoc
- doc/images/addressbook-tutorial-part2-add-contact.png 0 additions, 0 deletionsdoc/images/addressbook-tutorial-part2-add-contact.png
- doc/images/addressbook-tutorial-part2-add-successful.png 0 additions, 0 deletionsdoc/images/addressbook-tutorial-part2-add-successful.png
- doc/images/addressbook-tutorial-part2-signals-and-slots.png 0 additions, 0 deletionsdoc/images/addressbook-tutorial-part2-signals-and-slots.png
- doc/images/addressbook-tutorial-part2-stretch-effects.png 0 additions, 0 deletionsdoc/images/addressbook-tutorial-part2-stretch-effects.png
- doc/images/addressbook-tutorial-part3-screenshot.png 0 additions, 0 deletionsdoc/images/addressbook-tutorial-part3-screenshot.png
- doc/images/qtcreator-session-manager.png 0 additions, 0 deletionsdoc/images/qtcreator-session-manager.png
- doc/qtcreator.qdoc 2 additions, 2 deletionsdoc/qtcreator.qdoc
- src/libs/extensionsystem/iplugin.cpp 2 additions, 2 deletionssrc/libs/extensionsystem/iplugin.cpp
- src/libs/extensionsystem/pluginerrorview.cpp 1 addition, 1 deletionsrc/libs/extensionsystem/pluginerrorview.cpp
- src/libs/extensionsystem/pluginspec.cpp 2 additions, 2 deletionssrc/libs/extensionsystem/pluginspec.cpp
- src/plugins/coreplugin/dialogs/iwizard.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/dialogs/iwizard.cpp
- src/plugins/coreplugin/inavigationwidgetfactory.cpp 0 additions, 3 deletionssrc/plugins/coreplugin/inavigationwidgetfactory.cpp
- src/plugins/coreplugin/settingsdatabase.cpp 5 additions, 0 deletionssrc/plugins/coreplugin/settingsdatabase.cpp
- src/plugins/coreplugin/welcomemode.cpp 32 additions, 31 deletionssrc/plugins/coreplugin/welcomemode.cpp
- src/plugins/coreplugin/welcomemode.h 2 additions, 2 deletionssrc/plugins/coreplugin/welcomemode.h
- src/plugins/coreplugin/welcomemode_p.h 1 addition, 0 deletionssrc/plugins/coreplugin/welcomemode_p.h
- src/plugins/cppeditor/cpphoverhandler.cpp 2 additions, 2 deletionssrc/plugins/cppeditor/cpphoverhandler.cpp
- src/plugins/debugger/breakwindow.cpp 41 additions, 0 deletionssrc/plugins/debugger/breakwindow.cpp
Loading
Please register or sign in to comment