diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:31:09 +0100 |
| commit | 77ba093c613217304782114b5f78fa9ad5512c38 (patch) | |
| tree | 826666b1357354c5d96fa335d8aaeec84cc5ef39 /src/serialport/doc/src/index.qdoc | |
| parent | 3e0d23ff3533fd11e0f5b680e1943e457468310c (diff) | |
| parent | dd9fdb2ba4548f70eeceec2cfd2cd1ccdbbfc3d9 (diff) | |
| download | qtserialport-77ba093c613217304782114b5f78fa9ad5512c38.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/serialport/blockingmaster/masterthread.cpp
Change-Id: I3716089bae99247f98ed02656d4418de5f866c1d
Diffstat (limited to 'src/serialport/doc/src/index.qdoc')
0 files changed, 0 insertions, 0 deletions