diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:02:13 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 11:19:21 +0200 |
| commit | fcf126812561310a29aab86b668205fe3f4eaab5 (patch) | |
| tree | e831972c3a8045845b09968881d7d56d6ca84d4b /src/plugins/canbus | |
| parent | 661c112b5d1f3a0d01239989ae2de8a28c95b158 (diff) | |
| parent | ac06c016c043a75200488c48125336a6e66d74fa (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: Ie71047784aaa1db4b1a3e071fb026f6db3713c11
Diffstat (limited to 'src/plugins/canbus')
0 files changed, 0 insertions, 0 deletions