projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c84747e 5c5ae1d)
Merge branch 'master' into openjpeg-2.1
authorAntonin Descampe <antonin@gmail.com>
Mon, 25 Jan 2016 16:55:01 +0000 (17:55 +0100)
committerAntonin Descampe <antonin@gmail.com>
Mon, 25 Jan 2016 16:55:01 +0000 (17:55 +0100)

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