summaryrefslogtreecommitdiffstats
path: root/src/plugins/hardwareintegration
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-01 03:02:15 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-01 03:02:15 +0200
commit79fb1089474514dbe1b25004df126d3194c952a8 (patch)
tree2cd05c05beffaa02a592c43b92b43dfca75b6db8 /src/plugins/hardwareintegration
parent91ed3e7c5800a6ef4bea9d0c4d80196f94caec95 (diff)
parent03e160cfd286bb336e875a180efd83635be7a27f (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/plugins/hardwareintegration')
0 files changed, 0 insertions, 0 deletions