diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:35 +0100 |
| commit | d6d6bae390b90ff341d08e7d4d51c4f7ccd972c2 (patch) | |
| tree | 3b57ad89253626c4f5c962be0122ca73398b24fe | |
| parent | 44c23c8c1a3a78da27e33dd6a48dc57f9876ed37 (diff) | |
| parent | 5df003abcb564fef4074a73969d3ca3aaf8acf1d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Iada70a14740f15555d95989dc3f7bdd5470b2fa3
0 files changed, 0 insertions, 0 deletions