projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3259fe2 6721f8a)
Merge branch 'master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Tue, 13 Oct 2015 19:57:58 +0000 (21:57 +0200)
committermayeut <mayeut@users.noreply.github.com>
Tue, 13 Oct 2015 19:57:58 +0000 (21:57 +0200)

Trivial merge
Fork of openjpeg with some changes used by DCP-o-matic.