diff options
author | Liang Qi <liang.qi@qt.io> | 2020-04-23 10:02:32 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-04-23 10:02:32 +0200 |
commit | 076fdbe289d4edc309f0e4589f7f5907bd36f86c (patch) | |
tree | c348e14aa3ee8879e78b763f5f2a0aab320c0d46 /qtserialport | |
parent | 0f0ff063d2994c4ae2c610b570aed1a18bee2a62 (diff) | |
parent | cd7c03f4de00862c095a84a7bf73869bd7dbdf14 (diff) | |
download | qt5-076fdbe289d4edc309f0e4589f7f5907bd36f86c.tar.gz |
Merge remote-tracking branch 'origin/5.12.8' into 5.12wip/qtsaferenderer/masterwip/qtsaferenderer/1.2wip/qtsaferenderer/1.1
Conflicts:
.gitmodules
Change-Id: I5a3c7de3adc990e1294bb0fde461ddd4e1557b37
Diffstat (limited to 'qtserialport')
0 files changed, 0 insertions, 0 deletions