diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-16 03:00:44 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-16 03:00:44 +0200 |
commit | 5fba848889ade8eb067b8a54011e20e9d59b4738 (patch) | |
tree | a4e1132d90344098f4e1e94121bac997de8595a6 /.qmake.conf | |
parent | 86872a1846ce622bb5f305a75a20939ac145122f (diff) | |
parent | 83e8e25a6a3a94482088916be724d47620f4ea53 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
Change-Id: I8ad02040bdd3ce055c48c761b08f9ac1f742a6fa
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions