summaryrefslogtreecommitdiff
path: root/src/plugins/imageformats/mng/qmnghandler.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:18 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-07 19:32:18 +0100
commit35b4108a4e2090a856226ac15b796e118655fa8b (patch)
tree27342e26862f6b24b33ba5e5587bdca96ff88ac5 /src/plugins/imageformats/mng/qmnghandler.cpp
parentcb800de1f42aaacdeb423d30adbcbf8975e32f2f (diff)
parentbf5b49878d75d316f31225f76152e8381a3d5f0f (diff)
downloadqtimageformats-35b4108a4e2090a856226ac15b796e118655fa8b.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Iaf805dab2dd057ca756e4034b9f5f55ac8bb097d
Diffstat (limited to 'src/plugins/imageformats/mng/qmnghandler.cpp')
0 files changed, 0 insertions, 0 deletions