diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-08-31 14:49:19 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-08-31 14:49:19 +0200 |
| commit | 6477a07654bdd498282953d8fc85c2a3e74086af (patch) | |
| tree | 36b13e6aa306247a2a80a03058e4581b466cabba /src/plugins/cpptools/cpprefactoringchanges.cpp | |
| parent | b5e2485fbfc510c43185f94f17c88dec17416ca6 (diff) | |
| parent | e8eafd85eea5201504d305fcdc68ba324bbd4715 (diff) | |
| download | qt-creator-6477a07654bdd498282953d8fc85c2a3e74086af.tar.gz | |
Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/clangtools/virtualfilesystemoverlay.h
src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui
src/plugins/qmldesigner/designercore/model/abstractview.cpp
Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
Diffstat (limited to 'src/plugins/cpptools/cpprefactoringchanges.cpp')
0 files changed, 0 insertions, 0 deletions