diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:45 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:45 +0100 |
| commit | 0f74f5b2dca75dc7fb99e08bb465aac8d7abd572 (patch) | |
| tree | e8508268208a571f8ddc02e06a322bb345375c68 | |
| parent | 83a481c4e2946fed7c072cdc971370cd2ac5591f (diff) | |
| parent | 82fbed7445875678ab4b3d29fed89bbfcbf890fa (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I67ccafe6b1f0f637bd6cbda77754c3dd66b97797
0 files changed, 0 insertions, 0 deletions