Merge commit 'origin/1.2'
Conflicts: src/plugins/coreplugin/welcomemode.ui
No related branches found
No related tags found
Showing
- doc/qtcreator.qdoc 1 addition, 1 deletiondoc/qtcreator.qdoc
- doc/qtcreator.qdocconf 5 additions, 5 deletionsdoc/qtcreator.qdocconf
- scripts/replaceVersion.sh 1 addition, 1 deletionscripts/replaceVersion.sh
- share/qtcreator/qtcdebugger/main.cpp 1 addition, 3 deletionsshare/qtcreator/qtcdebugger/main.cpp
- share/qtcreator/static.pro 3 additions, 1 deletionshare/qtcreator/static.pro
- share/qtcreator/translations/qtcreator_de.ts 63 additions, 42 deletionsshare/qtcreator/translations/qtcreator_de.ts
- share/qtcreator/translations/translations.pro 3 additions, 3 deletionsshare/qtcreator/translations/translations.pro
- src/app/Info.plist 2 additions, 2 deletionssrc/app/Info.plist
- src/libs/extensionsystem/plugindetailsview.cpp 2 additions, 1 deletionsrc/libs/extensionsystem/plugindetailsview.cpp
- src/libs/extensionsystem/plugindetailsview.ui 83 additions, 93 deletionssrc/libs/extensionsystem/plugindetailsview.ui
- src/plugins/bineditor/BinEditor.pluginspec 3 additions, 3 deletionssrc/plugins/bineditor/BinEditor.pluginspec
- src/plugins/bookmarks/Bookmarks.pluginspec 4 additions, 4 deletionssrc/plugins/bookmarks/Bookmarks.pluginspec
- src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec 5 additions, 5 deletions...lugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
- src/plugins/coreplugin/Core.pluginspec 1 addition, 1 deletionsrc/plugins/coreplugin/Core.pluginspec
- src/plugins/coreplugin/coreconstants.h 2 additions, 2 deletionssrc/plugins/coreplugin/coreconstants.h
- src/plugins/coreplugin/editormanager/editormanager.cpp 2 additions, 0 deletionssrc/plugins/coreplugin/editormanager/editormanager.cpp
- src/plugins/coreplugin/stylehelper.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/stylehelper.cpp
- src/plugins/coreplugin/versiondialog.cpp 15 additions, 12 deletionssrc/plugins/coreplugin/versiondialog.cpp
- src/plugins/coreplugin/welcomemode.ui 48 additions, 13 deletionssrc/plugins/coreplugin/welcomemode.ui
- src/plugins/cpaster/CodePaster.pluginspec 4 additions, 4 deletionssrc/plugins/cpaster/CodePaster.pluginspec
Loading
Please register or sign in to comment