summaryrefslogtreecommitdiff
path: root/src/plugins/wmf/wmfserviceplugin.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-16 03:04:06 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-16 03:04:07 +0100
commit95b7fc4950c1f0d895896cf3086c69126d45e061 (patch)
tree8ec1d5cef26bf170ca9cdf3635ec44c4dc6db424 /src/plugins/wmf/wmfserviceplugin.cpp
parent9a5bae4ed9ca10fedf842b5c293d1c0ef918c8af (diff)
parent256d0cebb83bbcfd087c510a5901a875740fa791 (diff)
downloadqtmultimedia-95b7fc4950c1f0d895896cf3086c69126d45e061.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I8cb32311f9a43f3ae9c6890cc875bcc66088a56c
Diffstat (limited to 'src/plugins/wmf/wmfserviceplugin.cpp')
0 files changed, 0 insertions, 0 deletions