diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-11-01 09:46:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-11-01 09:46:02 +0100 |
| commit | 4dac32d6610db6c2f0c99b1d966ab53f38cd26e9 (patch) | |
| tree | b012a6306921a6ecd9bca9f33a95b7f741661f0e /src/plugins/diffeditor/diffeditorwidgetcontroller.cpp | |
| parent | ff2d00727c82f73f2bf0bb7ed69b5c1c76ea395b (diff) | |
| parent | 00eabac5655a67be81b104b433c78afd87ad6db7 (diff) | |
| download | qt-creator-4dac32d6610db6c2f0c99b1d966ab53f38cd26e9.tar.gz | |
Merge remote-tracking branch 'origin/6.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: Id5e67457e2c8c96cfcd29fb5469b6650ec7bcc94
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidgetcontroller.cpp')
0 files changed, 0 insertions, 0 deletions