diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:44 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:44 +0100 |
| commit | 1d664811805984e58cc44d4553c700d51389c389 (patch) | |
| tree | d2cbeeb1bf82487b4014f5cf39f3a1faa8d3a8ef | |
| parent | 5eaed740691d7df03424aab37dbae61596fbcc01 (diff) | |
| parent | 357530292e29a25ff6ddec17a3acbf67588813e8 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I9eb3599c21cb8b460cb5d2fd2af1fb1e277a6803
0 files changed, 0 insertions, 0 deletions