summaryrefslogtreecommitdiffstats
path: root/examples/serialport/doc
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-05 07:30:35 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-05 07:30:35 +0100
commit09fa8225d525b12ba22234a59452decaf987fb8a (patch)
treeb905186777621f0ea90289cb87b7ff15cff1a87a /examples/serialport/doc
parentd5a8b58280b3e0263a22edc2a8a811f3252df27e (diff)
parent2216279ffd43fb84042da2faa5bc432770351ec3 (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts: .qmake.conf Change-Id: I73cc3d9c4a38e6c586ac0c2f54c94184d65c560a
Diffstat (limited to 'examples/serialport/doc')
0 files changed, 0 insertions, 0 deletions