diff options
| author | Stephan Mühlstrasser <stm@pdflib.com> | 2015-10-21 08:57:45 +0200 |
|---|---|---|
| committer | Stephan Mühlstrasser <stm@pdflib.com> | 2015-10-21 08:57:45 +0200 |
| commit | 540aa58f6c12224b5762f141fe71a2760e7c7766 (patch) | |
| tree | a9101ec9359512001465bb721ae9e3022a829e79 /wrapping/java/openjp2/JavaOpenJPEGDecoder.c | |
| parent | 0967d6485414e7038d51f11e4e57f7a4bf5b4572 (diff) | |
| parent | d48be27f5aa018d398cf9369b2c664bee4ce6e19 (diff) | |
Merge branch 'master' into opj_aligned_malloc
Conflicts:
src/lib/openjp2/opj_malloc.c
Diffstat (limited to 'wrapping/java/openjp2/JavaOpenJPEGDecoder.c')
0 files changed, 0 insertions, 0 deletions