diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-26 10:00:20 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 10:00:20 +0100 |
commit | aef65fb80fc60909ac5141f2df1f9918f964528c (patch) | |
tree | 86067237c10a12f10195b94ca099ef326fb282b1 /examples/serialbus/can/connectdialog.h | |
parent | 6cb07fb512082bac7df5b50048d7ade111b575e0 (diff) | |
parent | c8fe92ef54b2d310e8c8c143962fd6f43bf46c27 (diff) |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I34693c3a4b342b1a5b30b5adc4af34f67fccb8b2
Diffstat (limited to 'examples/serialbus/can/connectdialog.h')
0 files changed, 0 insertions, 0 deletions