summaryrefslogtreecommitdiffstats
path: root/src/plugins/hardwareintegration
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-24 03:03:07 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-24 03:03:13 +0200
commit40d492e6a4f36005e6f3a274b91ae38bce42a924 (patch)
tree05aed509e7bfa548242c1a70874476794493ddef /src/plugins/hardwareintegration
parentda371debb1bcc4a22c5157b0d8a2e09a7cb7ce1b (diff)
parent49d9059f5abad24824ba9cdbef1d8ed39e6c62fd (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/plugins/hardwareintegration')
0 files changed, 0 insertions, 0 deletions