diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-07-08 11:01:43 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-07-08 11:01:43 +0200 |
| commit | 5fa442434a1c6c811f32012f0ecc2f3b2536dde5 (patch) | |
| tree | eb5620e7109dbf3180660c553e06cfafcc814ad4 | |
| parent | b508a98e6ae8ff661a6c13c9b87e0d08e04512c4 (diff) | |
| parent | 88b9ef5c5bb1c777c53a2680f762d9a0bb4eda66 (diff) | |
Merge remote-tracking branch 'origin/4.12' into 4.13
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: Icb405079fd601619b506e5c56b6ef465bc0424bc
0 files changed, 0 insertions, 0 deletions