summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:29:52 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-17 12:29:53 +0200
commitf2eadc65c39762c187b21b20cd6b54feec8a2c6e (patch)
treecbf28189f9cde7fde9e9519aef24aa85a5781dfb /src/plugins
parent9b6928b7cc6f12638ae625c67ecf437cfc694498 (diff)
parent3b271264407e0e2b598f94002b87b1fb1177ac1f (diff)
Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions