diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:06:51 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:06:51 +0100 |
commit | 5e4a21f0004955a64dd600f717682a6976a53798 (patch) | |
tree | 7dc0ad9d170531a5ac4b0ea373364dbc2cc47dec /.qmake.conf | |
parent | bf9eedf055f0a23f0137058f6618cd17246f77fb (diff) | |
parent | 2914af23f0691bc04c1bd66faf79b403e68ff8e4 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9da9d39dffb49eca2c54e3768e5210dfb0e00afe
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions