diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-12 03:03:18 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-12 03:03:18 +0100 |
| commit | 7ca42663e0ff492be6c5bdf0f9168b47302fd22c (patch) | |
| tree | fecbb3995db1543ef5334933cbe70c5e7c125503 /src/plugins/imageformats/jp2/main.cpp | |
| parent | 0d150412b607680ea6ce79baf60c2d2709d5f057 (diff) | |
| parent | 3d157f9773a2db1a3096a86e5170ace975646ca3 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I48926bf0b3f2dac7806ff30e06e5e317c7fe018c
Diffstat (limited to 'src/plugins/imageformats/jp2/main.cpp')
0 files changed, 0 insertions, 0 deletions