]> granicus.if.org Git - openjpeg/commitdiff
projects / openjpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0967d64 d48be27)
Merge branch 'master' into opj_aligned_malloc
authorStephan Mühlstrasser <stm@pdflib.com>
Wed, 21 Oct 2015 06:57:45 +0000 (08:57 +0200)
committerStephan Mühlstrasser <stm@pdflib.com>
Wed, 21 Oct 2015 06:57:45 +0000 (08:57 +0200)
Conflicts:
src/lib/openjp2/opj_malloc.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.