projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ea4486 f82d7f3)
Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Wed, 23 Sep 2015 19:20:11 +0000 (21:20 +0200)
committermayeut <mayeut@users.noreply.github.com>
Wed, 23 Sep 2015 19:20:11 +0000 (21:20 +0200)

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