]> granicus.if.org Git - openjpeg/commitdiff
projects / openjpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a9cb9a de0a9ed)
Merge branch 'master' into travis-abi
authormayeut <mayeut@users.noreply.github.com>
Fri, 9 Oct 2015 20:16:37 +0000 (22:16 +0200)
committermayeut <mayeut@users.noreply.github.com>
Fri, 9 Oct 2015 20:16:37 +0000 (22:16 +0200)
1  2 
src/lib/openjp2/openjpeg.h patch | diff1 | diff2 | blob | history

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