Merge remote branch 'origin/2.0'
Conflicts: src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/git/gitclient.cpp src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
Showing
- doc/qtcreator.qdoc 1 addition, 1 deletiondoc/qtcreator.qdoc
- share/qtcreator/templates/wizards/qml-extension/lib.png 0 additions, 0 deletionsshare/qtcreator/templates/wizards/qml-extension/lib.png
- share/qtcreator/templates/wizards/qml-extension/object.cpp 0 additions, 0 deletionsshare/qtcreator/templates/wizards/qml-extension/object.cpp
- share/qtcreator/templates/wizards/qml-extension/object.h 0 additions, 0 deletionsshare/qtcreator/templates/wizards/qml-extension/object.h
- share/qtcreator/templates/wizards/qml-extension/plugin.cpp 0 additions, 0 deletionsshare/qtcreator/templates/wizards/qml-extension/plugin.cpp
- share/qtcreator/templates/wizards/qml-extension/plugin.h 0 additions, 0 deletionsshare/qtcreator/templates/wizards/qml-extension/plugin.h
- share/qtcreator/templates/wizards/qml-extension/project.pro 0 additions, 0 deletionsshare/qtcreator/templates/wizards/qml-extension/project.pro
- share/qtcreator/templates/wizards/qml-extension/qmldir 0 additions, 0 deletionsshare/qtcreator/templates/wizards/qml-extension/qmldir
- share/qtcreator/templates/wizards/qml-extension/wizard.xml 5 additions, 5 deletionsshare/qtcreator/templates/wizards/qml-extension/wizard.xml
- share/qtcreator/translations/qtcreator_ru.ts 213 additions, 4352 deletionsshare/qtcreator/translations/qtcreator_ru.ts
- share/qtcreator/translations/translations.pro 1 addition, 1 deletionshare/qtcreator/translations/translations.pro
- src/plugins/coreplugin/editormanager/editormanager.cpp 4 additions, 1 deletionsrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/debugger/cdb/cdboptionspagewidget.ui 1 addition, 1 deletionsrc/plugins/debugger/cdb/cdboptionspagewidget.ui
- src/plugins/debugger/debuggeruiswitcher.cpp 7 additions, 2 deletionssrc/plugins/debugger/debuggeruiswitcher.cpp
- src/plugins/debugger/debuggeruiswitcher.h 2 additions, 0 deletionssrc/plugins/debugger/debuggeruiswitcher.h
- src/plugins/git/gitclient.cpp 19 additions, 9 deletionssrc/plugins/git/gitclient.cpp
- src/plugins/git/gitclient.h 7 additions, 3 deletionssrc/plugins/git/gitclient.h
- src/plugins/git/gitplugin.cpp 14 additions, 3 deletionssrc/plugins/git/gitplugin.cpp
- src/plugins/git/gitplugin.h 2 additions, 1 deletionsrc/plugins/git/gitplugin.h
- src/plugins/help/helpplugin.cpp 3 additions, 3 deletionssrc/plugins/help/helpplugin.cpp
Loading
Please register or sign in to comment