Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtSerialBus
Commits
b65de45f
Commit
b65de45f
authored
7 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: .qmake.conf Change-Id: If12daffe4655f71d9aea39e0ed9e0db405a09fe7
parents
ef2872b2
81b1ae51
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dist/changes-5.9.4
+37
-0
dist/changes-5.9.4
src/plugins/canbus/socketcan/socketcanbackend.cpp
+7
-0
src/plugins/canbus/socketcan/socketcanbackend.cpp
src/plugins/canbus/tinycan/tinycanbackend.cpp
+3
-1
src/plugins/canbus/tinycan/tinycanbackend.cpp
src/serialbus/doc/src/tinycan.qdoc
+6
-4
src/serialbus/doc/src/tinycan.qdoc
with
53 additions
and
5 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets