summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-17 03:00:40 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-17 03:00:40 +0100
commita2d5e9d3edb869a3ab0d6b52cd9b240d9e5b1be7 (patch)
tree56d16d6ebfad46c11a4ea1358ce0dd7eb00d1b77 /tests
parenta344fa1b1244453e895d86147155065143418791 (diff)
parentfe11f37ca0d18c0025097a54c1331af25285d6fe (diff)
downloadqtimageformats-a2d5e9d3edb869a3ab0d6b52cd9b240d9e5b1be7.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I0c1bcec8ac906cc5390bc85eb8ddfd6c5bc2c98f
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions