diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:24:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:39:10 +0200 |
| commit | 004289a1b7e5ff5c4f19fab3c3d41c009429b352 (patch) | |
| tree | f1c14c9771523638d5f3d7a3b306c5654e490c33 /examples/serialport/terminal/console.cpp | |
| parent | 2e7899f477b498af1724ed98d61752f26fd1da49 (diff) | |
| parent | 93b539140c06da07d330c9ecad67ab5ed3f9b0c8 (diff) | |
| download | qtserialport-004289a1b7e5ff5c4f19fab3c3d41c009429b352.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ie7fa76a9fb0013106e5a21b587585c8ccd7339d5
Diffstat (limited to 'examples/serialport/terminal/console.cpp')
0 files changed, 0 insertions, 0 deletions