summaryrefslogtreecommitdiffstats
path: root/src/plugins/canbus/peakcan/peakcanbackend.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-29 03:01:43 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-29 03:01:44 +0100
commit8b1a6de795523156a5a74dd2a544d866a8beeb53 (patch)
tree6d27cd7b1bc036d3d4af0bfef55e3d5ceb78fcb8 /src/plugins/canbus/peakcan/peakcanbackend.cpp
parent6e275b20911fc3e5af2a1b972ec3550235250157 (diff)
parentb63877157c2c9681ced1efbfefe1d2d1debf812e (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/plugins/canbus/peakcan/peakcanbackend.cpp')
0 files changed, 0 insertions, 0 deletions