diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-03 03:03:30 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-03 03:03:30 +0100 |
commit | d34ae8f61fa92ef31225cede984f07a8083e50fb (patch) | |
tree | 17d3daf469ddd1a70781539022b1a13e65c8d7a7 /examples/serialbus/modbus/slave/slave.pro | |
parent | 8c4b7368b5b8c499a3cdf40b2f4ae8bbfc616dd0 (diff) | |
parent | 834258bb3d17638e8e3dc2eca2a3115006c092fd (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I2060b7d74a0bfeecff06eb37db20261bfffa6666
Diffstat (limited to 'examples/serialbus/modbus/slave/slave.pro')
0 files changed, 0 insertions, 0 deletions