summaryrefslogtreecommitdiffstats
path: root/src/plugins/wmf/player/mfvideorenderercontrol.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 21:04:02 +0200
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2020-05-29 15:19:07 +0000
commit0fb5e86053427aa527d3780d279d7faf5b3469bf (patch)
tree4360c46704caa3293086848939d9e278b40ca44e /src/plugins/wmf/player/mfvideorenderercontrol.cpp
parentf60c028d522ce3e4ed01cf00e6601956a1f0ed01 (diff)
parentcf28371c1edd0c6d04c4518cdf3270067d0cf8a7 (diff)
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/plugins/wmf/player/mfvideorenderercontrol.cpp')
0 files changed, 0 insertions, 0 deletions