diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:21 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:33:21 +0100 |
| commit | 750f359fd7aa47775abefce2d2aa8ec423745622 (patch) | |
| tree | 8c6edc785b80e373983c85808cb4e3ce86e58fe8 | |
| parent | 9f69817344eb75fbc4613892c1f54ee69cae2e66 (diff) | |
| parent | cbdabc6a23d9ac66c7361a4437f649aacab7d900 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ie540b789353b9c702808aafc1a2f476acd723fad
0 files changed, 0 insertions, 0 deletions