diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:35:07 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-27 16:35:07 +0200 |
| commit | 922412f6d33be1a4cc6a2506954469c61c06e9a9 (patch) | |
| tree | 58ea3c302ecd344f3e68c054271b6abe113100ad /dist/changes-5.12.2 | |
| parent | 2e60208c8e2f81bac979fbdfd51f9079867d0203 (diff) | |
| parent | eef5e52668df079d1c401814d11dad22ec94e166 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ic8bbec1126304d50e0498581812a8ef05f9e4331
Diffstat (limited to 'dist/changes-5.12.2')
0 files changed, 0 insertions, 0 deletions