Merge branch 'master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Sun, 18 Oct 2015 01:23:38 +0000 (03:23 +0200)
committermayeut <mayeut@users.noreply.github.com>
Sun, 18 Oct 2015 01:23:38 +0000 (03:23 +0200)
commit80be580d50c5defd2f4628b9c4ae3dad4e7c6ef0
treea1a58498bae1cae88f77f898714d154e19c26d68
parentc8d03fea9b2d1db0f2000718395a9f01c59a1e2f
parent05b3afd28f8c3f9551d551c565609062f57f5837
Merge branch 'master' into coc-qcc
src/lib/openjp2/j2k.c