diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:05 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:05 +0100 |
commit | c4ee7b6525234284dc593f9304c72ef9d474a168 (patch) | |
tree | bec5e5e9eb91d09313aa3b6c0763badbc482e617 /.qmake.conf | |
parent | d17801df092f6776eaffb7428ba420fba3a45b4b (diff) | |
parent | d9f2a814eb5d8c2c0e985f60b345fefd956e2bb0 (diff) |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I29d8f54569c08b66576ce65737753dc9c3d84ebf
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions