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)
commit58320d2f3ba8aad624665058ec347a2a7622eb6d
tree20b2ac5329bee026f72335a98ff16d6e7be1e53c
parent5611209f1293d685943df16b420d35447f45e50d
parent4d2b6a671a0431722cd4845b246fe0a09f7ca934
Merge branch 'master' into openjpeg-2.1