diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:53:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:53:21 +0200 |
| commit | 167f91bebe2ee53fcd13d843dc9e0aad80b92d82 (patch) | |
| tree | be37659db59a00d534028f0f96a64407494853c6 /src/plugins/imageformats/macjp2/qiiofhelpers.cpp | |
| parent | df9cc29b243c0b299844ecf3330075afd0e157d1 (diff) | |
| parent | 99f384ac2353df89a1522e47c96cae6a945749e1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib70a7624c5047a639b6f156c2bd9a99426b9ad6c
Diffstat (limited to 'src/plugins/imageformats/macjp2/qiiofhelpers.cpp')
0 files changed, 0 insertions, 0 deletions