projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26b2728 c868279)
Merge branch 'master' into travis-matrix 584/head
authormayeut <mayeut@users.noreply.github.com>
Wed, 7 Oct 2015 19:14:38 +0000 (21:14 +0200)
committermayeut <mayeut@users.noreply.github.com>
Wed, 7 Oct 2015 19:14:38 +0000 (21:14 +0200)

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