diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:26 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:26 +0100 |
| commit | 431bd11f304179c77f55edd07d68b02d8408a45c (patch) | |
| tree | ff525e2bd225c4b62b6e1d0c65e0a91a77d447b7 | |
| parent | 986ea0aa5ffe4d50623fedc7ab3e482aec99687a (diff) | |
| parent | 11ee82ab6c256e50a39758272f1a8ca19dc8d4f3 (diff) | |
| download | qtx11extras-431bd11f304179c77f55edd07d68b02d8408a45c.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: Ib4743e4010167934f07a80fafd32734119b1da50
0 files changed, 0 insertions, 0 deletions