summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-01 01:00:23 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2020-03-03 14:13:53 +0100
commit2f2d870fdd1e99d27fda6fa986f7de8a17ad0edf (patch)
tree00c1ec03ae3e2a1f3971543dc975598a36cc12c6 /src/plugins/imageformats
parentbbe71efc23334ae928b887555d9cdee30fa826e3 (diff)
parent63312fe2ec1c1d8c0efabc02e3af8e5b47ca320e (diff)
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/plugins/imageformats')
0 files changed, 0 insertions, 0 deletions