diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-23 07:59:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-23 08:02:11 +0100 |
| commit | 85eb7b7a03ff0dab3b68f11a341e060eb066940a (patch) | |
| tree | e6607708f35431f131df9dc8ba7ac42cdaf3dd71 /qtserialbus | |
| parent | 390a373f28e5c3cdcb87f4af74976d5b5cba72b2 (diff) | |
| parent | 47d14b365ed7ee6b174d48c9cb14d72c66c26d71 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
coin/platform_configs/default.txt
Change-Id: Ie21baa51738ce0761fb45fba3819b1894cc808b6
Diffstat (limited to 'qtserialbus')
0 files changed, 0 insertions, 0 deletions