diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:04:12 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:04:12 +0200 |
| commit | 5f1bcf869227ebd3071db9b61a80e81effc38b94 (patch) | |
| tree | 7a587e0b33cae654dfb63cdee925ca859bbc9adb /src/3rdparty/jasper/src/libjasper/base/jas_icc.c | |
| parent | 3e081dbc87eb3872197f56ddea8f55edf9c8aa3b (diff) | |
| parent | 80017a1c7f829355edce61d5d50196cd1e13dcdd (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: If9cf53dac5e906350e652e52842f3b54bc3fe65f
Diffstat (limited to 'src/3rdparty/jasper/src/libjasper/base/jas_icc.c')
0 files changed, 0 insertions, 0 deletions