summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-12-07 12:04:28 +0100
committerLiang Qi <liang.qi@qt.io>2016-12-07 12:04:36 +0100
commit04f68053df5c90dca6947c6d2a5bb4e6851e62bb (patch)
tree4f655d54012e6f0a57a20a6d73b5f158659cad15 /src/plugins/imageformats
parentb9e800cd996e1401d3157a0cdb9e6ee6b05fd3a5 (diff)
parenta55f36211efe1bb0d6717c8545366120bd6dfd9f (diff)
Merge remote-tracking branch 'origin/5.7.1' into 5.7
Diffstat (limited to 'src/plugins/imageformats')
0 files changed, 0 insertions, 0 deletions