diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:04 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:04 +0100 |
commit | b9da7701d6f5ee454d138d02b983909e4f6a2077 (patch) | |
tree | b1a7680204c917817a84258619afab467df92f5d | |
parent | f39265ba3a3bdcc829c0cd69f69411e01efbf4e7 (diff) | |
parent | f7580fc30b4ed060b5075be6592c5c0703d40c53 (diff) | |
download | qtserialport-b9da7701d6f5ee454d138d02b983909e4f6a2077.tar.gz |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I36b638e386542b052cb58ceff1ff16f97f47a469
0 files changed, 0 insertions, 0 deletions