summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-15 03:01:03 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-15 03:01:03 +0100
commit0f8ac893a7fad1d3cdfcc55b511b2d88e4645ba9 (patch)
treea13fb0c1f7b91584e0d4eee480cc8486db1ffa35 /tests
parente8647158a20252f2a68fae9a92888281e3fa2a30 (diff)
parent178b8572d71a34975ffd7ada87227e1b8ed7296e (diff)
downloadqtimageformats-0f8ac893a7fad1d3cdfcc55b511b2d88e4645ba9.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ia3396dd92c66c42b8b0d0deba6b57b344a38ad02
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions