diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:04:59 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:04:59 +0200 |
commit | fef13b3b4c1a8af83086ecf49430903778e63624 (patch) | |
tree | cd7e41f7fae8a642c4023daca773ba40db9e6be1 /src/plugins/imageformats/tiff/main.cpp | |
parent | 08f40bc0f00716c3a8cbda70ed00dc2f16515e85 (diff) | |
parent | 338d48cd1a3eb317abe5ecb93964e34de3219144 (diff) |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I96f7e13e5a6f65dae1a9f7717e30021f81cf1e81
Diffstat (limited to 'src/plugins/imageformats/tiff/main.cpp')
0 files changed, 0 insertions, 0 deletions