diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:54 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:54 +0100 |
commit | f8449352c9af0ee8055c6a85981e092e9d109b9d (patch) | |
tree | 458d4f44ce94b764b773cacfc200329c0cb988d5 /src/serialport/qserialportinfo.h | |
parent | 5bee9d9f0f8cf5415ad9337aed88bccac3c15ce1 (diff) | |
parent | a2467f9ec2d09d6d665d169e0fb450169f921b12 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I35f19a7d266f90e957bfe01534a40c4d98b40b34
Diffstat (limited to 'src/serialport/qserialportinfo.h')
0 files changed, 0 insertions, 0 deletions