diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:40 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:08:40 +0100 |
| commit | eaeeacd1d0efdf1e65c1742240b2a8d5219d5b94 (patch) | |
| tree | 7bad1354551b2ee63cf1169cdc74f5dd9d76ca6c /src/plugins/imageformats/jp2 | |
| parent | 58f19cf8d51e06f1781f3142e6d872e5feb0690e (diff) | |
| parent | 0bd46d5861fa7b48c87cd3a734d00671df929869 (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I0314084af3028bd840b1b46f35134c464de51841
Diffstat (limited to 'src/plugins/imageformats/jp2')
0 files changed, 0 insertions, 0 deletions