summaryrefslogtreecommitdiffstats
path: root/qtimageformats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-10-20 14:17:57 +0200
committerLiang Qi <liang.qi@qt.io>2018-10-20 14:17:57 +0200
commit16c6fa419a9c16ea5573eb5080c4241739a36c8b (patch)
tree68f1b3072e4ca38576fe50c796ea08e11b4ff8aa /qtimageformats
parent0345ab91fbce6e5a11a9f1a05ec8f50ae4bcade5 (diff)
parent4667cfc432a97bf0400c2e4ecf2c1fbd535eae63 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'qtimageformats')
0 files changed, 0 insertions, 0 deletions