diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:38:04 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:38:22 +0200 |
commit | 462f074efbf6ac2cf03b818fa4103f5529be0291 (patch) | |
tree | 759989cfee8e546ebe3e0fa8fb8b51a01dc6ca04 /examples/serialport/blockingslave/dialog.cpp | |
parent | bec0b027f802d20dee00a33e9bc83d1d07b2dd42 (diff) | |
parent | 3e6308409dd679389e6231745e4d919d68d6487c (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I8b8dcf2103583b0a9113a0369a89aaa71c0b1b4b
Diffstat (limited to 'examples/serialport/blockingslave/dialog.cpp')
0 files changed, 0 insertions, 0 deletions