diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:22 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:22 +0100 |
| commit | 2d6b0588316fa0048007042fdd699e5b9d261933 (patch) | |
| tree | 12bcc17d1665018cedda027c4db1e624e7ac48d2 | |
| parent | 6c8238d94f0eb9d4f14b6428efe709a53d3e018f (diff) | |
| parent | 420006184c2e38bf21d466f167b64fe149b63a1a (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I732e189292c5d9c7a33e75924cb5cf9ce5cb76b7
0 files changed, 0 insertions, 0 deletions