summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-08-16 17:50:08 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-08-16 18:59:13 +0000
commitd98106d1d5a9ac68f0e4d20429d2d41b3dbcc131 (patch)
tree98af6e7d8be4bc026f0c2734a855580bf3e4bef2 /src/plugins/imageformats
parent30b0701c9b50ec718ec858d7777a01c66e333a9c (diff)
parent8559bf934def636ccff487464adb600d219f8778 (diff)
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/imageformats')
0 files changed, 0 insertions, 0 deletions