diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:34:06 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:34:06 +0200 |
commit | f6ab93a9f96b163cb82f4a2c0971d4fd5cc81fb4 (patch) | |
tree | a4f77a581a2ac38ff1617d046c8c37abc741a117 /.qmake.conf | |
parent | 0ae01dec7aa0ffbb59e6e947bfa2e73ae030346a (diff) | |
parent | 8577f12bf4dfd9adfe8c5b85a3712bf1cc5ba0c3 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I0ae0a162e133cffd8fb1a2c6b70826e50f06facd
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions