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-03-07 03:05:06 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-07 03:05:06 +0100
commit3653815f3cd12291790180456fe18df9e95f82ab (patch)
treed2f483df170a3c9a32649e072f69002718452ff0 /src/plugins/canbus/peakcan/peakcanbackend.cpp
parent8b1a6de795523156a5a74dd2a544d866a8beeb53 (diff)
parent275ed191e6452d7e623cff0cde0beb9e416a8e46 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2
Diffstat (limited to 'src/plugins/canbus/peakcan/peakcanbackend.cpp')
0 files changed, 0 insertions, 0 deletions