diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:01:01 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:27:47 +0200 |
| commit | 2b4a2e0a4974a2d1383e5ea099d72c192443cb67 (patch) | |
| tree | 707d0e5c56cfaa41620679cf122c23b8f8dec665 | |
| parent | 528f92c1201d457f1565f4a4daca765dd968ebb5 (diff) | |
| parent | 6e9661d0503503d5e8782a18730b0e3a83902257 (diff) | |
| download | qtserialport-2b4a2e0a4974a2d1383e5ea099d72c192443cb67.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: I64a34dbb92729cb7b6b717c2930da60da89df8f4
0 files changed, 0 insertions, 0 deletions