diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:12 +0100 |
| commit | e6a5786518d1a722611516e478aca6e0feea2b42 (patch) | |
| tree | b1a7680204c917817a84258619afab467df92f5d | |
| parent | b9da7701d6f5ee454d138d02b983909e4f6a2077 (diff) | |
| parent | 1f1fa990f8d16625d2c6a65aea58a010495cbc77 (diff) | |
| download | qtserialport-e6a5786518d1a722611516e478aca6e0feea2b42.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I539dddcfd88712d35c47e4f5f06ab6e94ba47e99
0 files changed, 0 insertions, 0 deletions