diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:02:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-15 03:02:49 +0100 |
| commit | d89c6be6f28182111cabe9547d10e31d8a7cd05f (patch) | |
| tree | 6bc85afae6a61ae1100c0a2aa7e9e9bf41c287e7 /src/plugins/imageformats/jp2/main.cpp | |
| parent | f422f52fcd7d0d5418d91b24508c3d5338cfd61a (diff) | |
| parent | 9584748fc6847240fd6b748e6735e91e451b8958 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1
Change-Id: I6bc111acb8e9a296404466f80f051a969bca5ddd
Diffstat (limited to 'src/plugins/imageformats/jp2/main.cpp')
0 files changed, 0 insertions, 0 deletions