diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:09 +0100 |
| commit | 6c8238d94f0eb9d4f14b6428efe709a53d3e018f (patch) | |
| tree | 12bcc17d1665018cedda027c4db1e624e7ac48d2 | |
| parent | 6cbb69ae3c1860668709f5e1900f97885a8607f4 (diff) | |
| parent | 66aa85ede203372e3c9eba6c399379fa2f3de43f (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I6d555b39fe19b936be151d1f6c599227df7fd1aa
0 files changed, 0 insertions, 0 deletions