diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:24:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:35:50 +0200 |
| commit | bec0f13fa456d3b52deb6dbb7add5e81b7734fa4 (patch) | |
| tree | e7f4b86b30df533f05720479b3cb6da3afed5134 /examples/serialbus/can/mainwindow.cpp | |
| parent | 152a59fe4c1bc2775550cf7fcbd1bde44e7f6bd6 (diff) | |
| parent | 1d37c357c843a2622d2af7e1684576e19a8c7c30 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ib884bd5bddf08b7c03cedd6941d60f157f128912
Diffstat (limited to 'examples/serialbus/can/mainwindow.cpp')
0 files changed, 0 insertions, 0 deletions