projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d29543 b4e8a42)
Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Sun, 13 Sep 2015 12:58:01 +0000 (14:58 +0200)
committermayeut <mayeut@users.noreply.github.com>
Sun, 13 Sep 2015 12:58:01 +0000 (14:58 +0200)

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