Merge branch 'master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:55:36 +0000 (20:55 +0200)
committermayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:55:36 +0000 (20:55 +0200)
commit2dab5fed591d19a3295b42225701801ee52569fb
treee70b732926ca0ac38b5cdc8e0d1cd0c49da7833d
parent4bb5e24d234dbf239119524edae4e23f39de7ee4
parente526d435cc874b97ae41eacc6b8b0b72419180fb
Merge branch 'master' into coc-qcc
src/lib/openjp2/j2k.c