aboutsummaryrefslogtreecommitdiffstats
path: root/qtmultimedia
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-08-04 11:51:40 +0200
committerLiang Qi <liang.qi@qt.io>2019-08-05 11:28:39 +0200
commit1e476b01fd29d65c39369afa22e315e19d159cbf (patch)
tree2a1d9a7d5ad3d6aa2ff617a87d5a7f563dfb630c /qtmultimedia
parent689ed30f2a0a05f7aba7debeb2554bb8baaa3544 (diff)
parent58977376e17870184a0da64065563b16b4a11f39 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'qtmultimedia')
0 files changed, 0 insertions, 0 deletions