diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:22 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:29:22 +0100 |
| commit | f47d1b9a11eb8c56afbd929285724f795097da09 (patch) | |
| tree | 53bc16c1e80f41d562928a326d87239ca01dc6f3 | |
| parent | a301e0ec1af0d888c032978fa8bcb155560ddb43 (diff) | |
| parent | 0ab5636aee10d8578307beb90c69e27f7f69574b (diff) | |
| download | qtserialport-f47d1b9a11eb8c56afbd929285724f795097da09.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: Ib7f7ba11d925cbcab3799a276d1b6e2e3a41acb6
0 files changed, 0 insertions, 0 deletions