diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:03:22 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:41:57 +0100 |
commit | 7c827dcbf82d5e5bfbba4053a32c54413a95182a (patch) | |
tree | 7e200ac1fea67f722b33ee3221fb3627dee1f841 /examples/serialport/slave/dialog.cpp | |
parent | 3864d9d4aadd7307b4b357c53d61fc3bedf42309 (diff) | |
parent | c0bdb69f432117e9119866bd610aea87d3eb4ee1 (diff) | |
download | qtserialport-7c827dcbf82d5e5bfbba4053a32c54413a95182a.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: I6c16b9513a2cd065c2ea11f01333f1ce00483c36
Diffstat (limited to 'examples/serialport/slave/dialog.cpp')
0 files changed, 0 insertions, 0 deletions