]> granicus.if.org Git - openjpeg/commit
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)
commit9466d3100e8fe7fd2605d6f39895f9abd7358268
tree36d9a8106bfb6ac69dc0ead07afbe4066546bbd6
parent58320d2f3ba8aad624665058ec347a2a7622eb6d
parentd1ca2b4f29efc9e12a77c7aba76091beae1966ec
Merge branch 'master' into openjpeg-2.1