diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:25:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:25:00 +0100 |
| commit | 4156b8a637783e6e3d54359275c28ea0c6a493b6 (patch) | |
| tree | 7c8ec17ceb0c61aecb13deaf77a358bb2ddf9542 /src/plugins/canbus/peakcan | |
| parent | 96406689fa3be46b1e7f4193c2d82b0407f543ad (diff) | |
| parent | 6cb07fb512082bac7df5b50048d7ade111b575e0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: Ie8bb65e2f51726a9a6108619d881263de1899b9c
Diffstat (limited to 'src/plugins/canbus/peakcan')
0 files changed, 0 insertions, 0 deletions