diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:56 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:56 +0100 |
| commit | d451e0af881365ba7524ed93e1ef3f68154c784b (patch) | |
| tree | 07ce913ca14b3eedad248ca5fd44de5d65cbeccf | |
| parent | 57c41f6d27d05e3af07bb8a50dfaeeb4c569aebe (diff) | |
| parent | dd00a38e0d65a73d7fa4df4c2fd196252d40d5ff (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I1e21542211694b1f707e7a20a5a9595369aef6e5
0 files changed, 0 insertions, 0 deletions