diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-08-16 10:51:50 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-08-16 10:51:50 +0200 |
| commit | ab606faad2a580aa98f4a3fda15fe4ddbbf653b6 (patch) | |
| tree | 0a1bbd2930f87793019f5eb7690bcc5311cd35bd /src/plugins/cpptools/cpprefactoringchanges.cpp | |
| parent | 80d8bca3952fcc8996f3f00d691117464db6284d (diff) | |
| parent | 2ab7176e79d12c6a9d32582416c25b7f1ce88c23 (diff) | |
| download | qt-creator-ab606faad2a580aa98f4a3fda15fe4ddbbf653b6.tar.gz | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/android/createandroidmanifestwizard.cpp
Change-Id: Ibd06a254f52c2c96d8c6ddd6b1d27483fcc29a17
Diffstat (limited to 'src/plugins/cpptools/cpprefactoringchanges.cpp')
0 files changed, 0 insertions, 0 deletions