summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-21 21:17:59 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-21 21:18:00 +0200
commitf3c9161147134bcc848f662947c5a59f3b48e94e (patch)
treef8b17478712e8488c3a3721400857108cf505b0e /src/multimedia
parentb7c6c49d8026bebef0c86ee5b686f8519f2e8622 (diff)
parent50b0a8670ba0ff460115c3ac113c19f17d36246e (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions