diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 11:14:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 07:34:45 +0200 |
| commit | eba0e3f243da949789871c3884c0ba158a3f6948 (patch) | |
| tree | e43188227c7f82c579a15ae7c1029940a79a7e18 /src/plugins/canbus/tinycan | |
| parent | e704a83b4a1a1eb69b62ee2cb029c549d99959ed (diff) | |
| parent | 94c64856be9af05d8459ad9fc16e6c95baa2c737 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/serialbus/qmodbusrtuserialmaster_p.h
Change-Id: Ib7b6b93816942837203d922992ee4b55f27bfec5
Diffstat (limited to 'src/plugins/canbus/tinycan')
0 files changed, 0 insertions, 0 deletions