diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:26 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:26 +0100 |
| commit | 1319e0965f6008f44f9216a7bb76e106a1710767 (patch) | |
| tree | 783a5cf17f367cf2c994e99b5c735cce21135807 | |
| parent | 62d5d55f5630a02b8af9c86162aeee81955b23c8 (diff) | |
| parent | 893fbdd0f0002b3ff74f6f428329191d120ed439 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I0aef00f419e931fb763d4e699d79083170771cd0
0 files changed, 0 insertions, 0 deletions