diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:37 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:37 +0100 |
| commit | eb5cd84d1fb2d602f2de8a7013498012b6b58d80 (patch) | |
| tree | 37644cc16ebcafdae5605e213fed45123f9a250c | |
| parent | 846bb17980e928b4e444ce0430dfb924b73bee4b (diff) | |
| parent | cd571466dc25674b25f34a3e2476c6a0b53dd25f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I7840e4aef805e250c065557393a3c7dc9034565e
0 files changed, 0 insertions, 0 deletions