diff options
| author | Antonin Descampe <antonin@gmail.com> | 2016-05-13 12:05:59 +0200 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2016-05-13 12:05:59 +0200 |
| commit | 58320d2f3ba8aad624665058ec347a2a7622eb6d (patch) | |
| tree | 20b2ac5329bee026f72335a98ff16d6e7be1e53c /wrapping/java/openjp2/JavaOpenJPEGDecoder.c | |
| parent | 5611209f1293d685943df16b420d35447f45e50d (diff) | |
| parent | 4d2b6a671a0431722cd4845b246fe0a09f7ca934 (diff) | |
Merge branch 'master' into openjpeg-2.1
Diffstat (limited to 'wrapping/java/openjp2/JavaOpenJPEGDecoder.c')
0 files changed, 0 insertions, 0 deletions