projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09c35dc 838dfb8)
Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Fri, 25 Sep 2015 20:27:56 +0000 (22:27 +0200)
committermayeut <mayeut@users.noreply.github.com>
Fri, 25 Sep 2015 20:27:56 +0000 (22:27 +0200)

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