projects / openjpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf77ede 3767af5)
Merge branch 'master' into openjpeg-2.1
authorAntonin Descampe <antonin@gmail.com>
Sat, 23 Jan 2016 18:51:16 +0000 (19:51 +0100)
committerAntonin Descampe <antonin@gmail.com>
Sat, 23 Jan 2016 18:51:16 +0000 (19:51 +0100)

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