projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5611209 4d2b6a6)
Merge branch 'master' into openjpeg-2.1 760/head
authorAntonin Descampe <antonin@gmail.com>
Fri, 13 May 2016 10:05:59 +0000 (12:05 +0200)
committerAntonin Descampe <antonin@gmail.com>
Fri, 13 May 2016 10:05:59 +0000 (12:05 +0200)

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