projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58320d2 d1ca2b4)
Merge branch 'master' into openjpeg-2.1
authorAntonin Descampe <antonin@gmail.com>
Sat, 14 May 2016 23:11:44 +0000 (01:11 +0200)
committerAntonin Descampe <antonin@gmail.com>
Sat, 14 May 2016 23:11:44 +0000 (01:11 +0200)

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