projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a06200 d0babeb)
Merge branch 'master' into openjpeg-2.1
authorAntonin Descampe <antonin@gmail.com>
Sun, 15 May 2016 17:19:15 +0000 (19:19 +0200)
committerAntonin Descampe <antonin@gmail.com>
Sun, 15 May 2016 17:19:15 +0000 (19:19 +0200)

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