diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:59 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:59 +0100 |
| commit | a4cf47ddfbfde719429ecd1c06bbb4b948cc9b9d (patch) | |
| tree | a536145d014a6251c585a0ed038a7d57f877a6c5 | |
| parent | 1550439befd5a68185862b9422714d31790c79ef (diff) | |
| parent | 2b51f76ab712690cc263516d628a4f8cbb723ba8 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I82cf948853713d0ebaef2a2890224f32e476922f
0 files changed, 0 insertions, 0 deletions