diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-04 14:45:45 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-04 14:45:52 +0200 |
commit | 9cd1ee923eea11d084d41158458bbb73a906c75c (patch) | |
tree | 913181de10c71d5616e403a407dd25d0c8809077 /.qmake.conf | |
parent | b784d232b2f3de4624ae6dd28c3f74eeb08b2e79 (diff) | |
parent | 6dd8ac17197a501fbad58c4468b1dd9a64a3fec8 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions