summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats/jpeg
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-04-07 08:31:13 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-04-07 09:38:34 +0000
commit191a21047863cd327d3e8102b08dbf20a4c6e0a5 (patch)
tree9be92e3111992951d87571ebbcf1e2859901050f /src/plugins/imageformats/jpeg
parentdea78262e52da38de47301e206459967aa6719bb (diff)
parent5d6073be27cb951b692bbcc4dc0dd54cc09c9fd4 (diff)
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/imageformats/jpeg')
0 files changed, 0 insertions, 0 deletions