diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:44 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:44 +0100 |
| commit | 07a3e819520d77e79d7595b1ec594d385eb8fdc7 (patch) | |
| tree | b5ca7f46954da6f0228cede689568cc1d71ecbea | |
| parent | a61ed3bce7df1ec56712d874e23a7ec95ad141ab (diff) | |
| parent | 74222a0e38687068970c8492d794cf92b898c6b6 (diff) | |
| download | qtserialport-07a3e819520d77e79d7595b1ec594d385eb8fdc7.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I16ce61d440f0435a0c6b9fd47fa3a99b331ce4a5
0 files changed, 0 insertions, 0 deletions