summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats/ico/main.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-27 01:00:10 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-27 01:00:11 +0200
commit03f7d0a005eca7c796c8721a8bec860e320f4219 (patch)
tree255b5b6a8d09e973fd52ae48b1373f95a6ebfda2 /src/plugins/imageformats/ico/main.cpp
parentc530ca1c170798159c3d84029841a1224d1cdc65 (diff)
parentd6e65ecac5852ed09fbf580b3fab5b21125dfd69 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'src/plugins/imageformats/ico/main.cpp')
0 files changed, 0 insertions, 0 deletions