]> granicus.if.org Git - openjpeg/commitdiff
projects / openjpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bb5e24 e526d43)
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)
1  2 
src/lib/openjp2/j2k.c patch | diff1 | diff2 | blob | history

diff --cc src/lib/openjp2/j2k.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.