]> granicus.if.org Git - openjpeg/commitdiff
Merge branch 'master' into issue-254
authormayeut <mayeut@users.noreply.github.com>
Fri, 5 Jun 2015 18:42:57 +0000 (20:42 +0200)
committermayeut <mayeut@users.noreply.github.com>
Fri, 5 Jun 2015 18:42:57 +0000 (20:42 +0200)
1  2 
src/lib/openjp2/j2k.c
src/lib/openjp2/j2k.h

Simple merge
Simple merge