Merge branch '1.0.0' into master
Conflicts: src/plugins/debugger/gdbengine.cpp
Showing
- scripts/shipping/prepare-linux-qt-for-shipping.sh 0 additions, 109 deletionsscripts/shipping/prepare-linux-qt-for-shipping.sh
- share/qtcreator/license.txt 0 additions, 229 deletionsshare/qtcreator/license.txt
- share/qtcreator/schemes/MS_Visual_C++.kms 17 additions, 17 deletionsshare/qtcreator/schemes/MS_Visual_C++.kms
- share/qtcreator/schemes/Xcode.kms 20 additions, 20 deletionsshare/qtcreator/schemes/Xcode.kms
- share/share.pri 1 addition, 7 deletionsshare/share.pri
- src/app/qtcreator.ico 0 additions, 0 deletionssrc/app/qtcreator.ico
- src/libs/utils/projectintropage.ui 1 addition, 1 deletionsrc/libs/utils/projectintropage.ui
- src/plugins/bookmarks/bookmarks_global.h 4 additions, 4 deletionssrc/plugins/bookmarks/bookmarks_global.h
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.h 2 additions, 2 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.h
- src/plugins/coreplugin/coreconstants.h 3 additions, 3 deletionssrc/plugins/coreplugin/coreconstants.h
- src/plugins/coreplugin/html/images/product_logo.png 0 additions, 0 deletionssrc/plugins/coreplugin/html/images/product_logo.png
- src/plugins/coreplugin/html/qt.css 1 addition, 0 deletionssrc/plugins/coreplugin/html/qt.css
- src/plugins/coreplugin/images/qtcreator_logo_128.png 0 additions, 0 deletionssrc/plugins/coreplugin/images/qtcreator_logo_128.png
- src/plugins/coreplugin/images/qtcreator_logo_16.png 0 additions, 0 deletionssrc/plugins/coreplugin/images/qtcreator_logo_16.png
- src/plugins/coreplugin/images/qtcreator_logo_24.png 0 additions, 0 deletionssrc/plugins/coreplugin/images/qtcreator_logo_24.png
- src/plugins/coreplugin/images/qtcreator_logo_32.png 0 additions, 0 deletionssrc/plugins/coreplugin/images/qtcreator_logo_32.png
- src/plugins/coreplugin/images/qtcreator_logo_48.png 0 additions, 0 deletionssrc/plugins/coreplugin/images/qtcreator_logo_48.png
- src/plugins/coreplugin/images/qtcreator_logo_64.png 0 additions, 0 deletionssrc/plugins/coreplugin/images/qtcreator_logo_64.png
- src/plugins/coreplugin/mainwindow.cpp 3 additions, 1 deletionsrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/coreplugin/navigationwidget.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/navigationwidget.cpp
Loading
Please register or sign in to comment