summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-27 03:01:54 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-27 03:01:54 +0200
commita9be081dacbd307eb277ef1fe6c095677e00248f (patch)
tree8181fc6d57ef886d4f8bb539061948d8dceb7197 /dist
parent4783c6dc4441ab833050a08996d40d959960ecff (diff)
parent8455ab6cb29fcccf44977c517689a8ad26781140 (diff)
downloadqtimageformats-a9be081dacbd307eb277ef1fe6c095677e00248f.tar.gz
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I56fb4e7a178ac79c75a846d9a7bcd8f1f3533673
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions