diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:23 +0200 |
| commit | 2aca2b0a99eb20f53b3bc9814fd7514d8ea60d50 (patch) | |
| tree | 479b97308acca3a823021712c902ed63d15715ff /tests/auto/jp2 | |
| parent | f8523607889c3f8236bd27c8bb45c0f23b20f3ab (diff) | |
| parent | bdc2df1a04f65c35651ad962f12723e177f4bd2f (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I8ac0a70b3ee59cc59a219dc14c71a467cfc0186d
Diffstat (limited to 'tests/auto/jp2')
0 files changed, 0 insertions, 0 deletions