diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-28 01:00:17 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-10-29 11:13:03 +0100 |
commit | f3fd887de1c9cf4717bf475e5bb1ddf79ac6521e (patch) | |
tree | a3520d7a869cfb6188787a06292ea656dcde2b51 /.qmake.conf | |
parent | 82ee87b7b83746bcc3d13af72979d0dca4c2de3d (diff) | |
parent | 08f90adffdde1d7a4efa0de66f69091bd52d1d4b (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions