summaryrefslogtreecommitdiff
path: root/src/serialport/qserialport_p.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:24:01 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:24:01 +0200
commit84feab670cce8414ad54f4d19b46291c7fdb14cf (patch)
tree329f237009d6ffd018964143db3b17d63ea823e0 /src/serialport/qserialport_p.h
parentf8449352c9af0ee8055c6a85981e092e9d109b9d (diff)
parent9a70ee2389d3302f6a4262325f8a76e4d867b478 (diff)
downloadqtserialport-84feab670cce8414ad54f4d19b46291c7fdb14cf.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I1b9b5ff33064eab6e35e4fd57b72b8fbf2a5a022
Diffstat (limited to 'src/serialport/qserialport_p.h')
0 files changed, 0 insertions, 0 deletions