summaryrefslogtreecommitdiffstats
path: root/src/serialbus/qcanbusframe.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-09 03:06:02 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-09 03:06:02 +0100
commitcaedc93b22286721c9bf93bcc91e471bb601898b (patch)
tree36acfc766c65865aa0637081216b0b6390770bdb /src/serialbus/qcanbusframe.cpp
parentbdff94ba65a22cb1edf4be15459c128c5de146bc (diff)
parent15c618da80a71d0f5c33cdade6535f43eb852363 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/serialbus/qcanbusframe.cpp')
0 files changed, 0 insertions, 0 deletions