projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 987f960 e526d43)
Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:54:16 +0000 (20:54 +0200)
committermayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:54:16 +0000 (20:54 +0200)

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